projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
049e6dd
)
drm/nouveau/bios: translate devinit pri/sec i2c bus to internal identifiers
author
Ben Skeggs
<bskeggs@redhat.com>
Tue, 29 Sep 2015 02:08:35 +0000
(12:08 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Mon, 12 Oct 2015 03:48:28 +0000
(13:48 +1000)
fdo#92013.
Regression from "i2c: transition pad/ports away from being based on nvkm_object"
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
index 65af31441e9c29496647084d927c11f393974653..a7d69ce7abc1ad33b5fd283a5f4b5321feb89f18 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
+++ b/
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
@@
-267,6
+267,12
@@
init_i2c(struct nvbios_init *init, int index)
index = NVKM_I2C_BUS_PRI;
if (init->outp && init->outp->i2c_upper_default)
index = NVKM_I2C_BUS_SEC;
+ } else
+ if (index == 0x80) {
+ index = NVKM_I2C_BUS_PRI;
+ } else
+ if (index == 0x81) {
+ index = NVKM_I2C_BUS_SEC;
}
bus = nvkm_i2c_bus_find(i2c, index);