summaryrefslogtreecommitdiff
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:00:34 +1000
commit2470eb023d2bea7b8d9e0de6af111253dd37a9a3 (patch)
treeef5c7391400f5ba0681311493f49b8fd84e8ed51
parenta8ede6474c1eb85978837453fad39b4b5fccef46 (diff)
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>
-rw-r--r--drm/nouveau/nvkm/subdev/bios/init.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drm/nouveau/nvkm/subdev/bios/init.c b/drm/nouveau/nvkm/subdev/bios/init.c
index 65af3144..a7d69ce7 100644
--- a/drm/nouveau/nvkm/subdev/bios/init.c
+++ b/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);