summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-09-29 12:08:35 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-10-12 13:48:28 +1000
commit2239b76b0b1782160d5ca91ea1653dd67aa37e8a (patch)
tree870cf02627d508c38c1a5af7d080fa7051a19b2d /drivers/gpu
parent049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff)
downloadblackbird-op-linux-2239b76b0b1782160d5ca91ea1653dd67aa37e8a.tar.gz
blackbird-op-linux-2239b76b0b1782160d5ca91ea1653dd67aa37e8a.zip
drm/nouveau/bios: translate devinit pri/sec i2c bus to internal identifiers
fdo#92013. Regression from "i2c: transition pad/ports away from being based on nvkm_object" Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
index 65af31441e9c..a7d69ce7abc1 100644
--- 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);
OpenPOWER on IntegriCloud