diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-09-28 22:08:35 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-10-11 23:48:28 -0400 |
commit | 2239b76b0b1782160d5ca91ea1653dd67aa37e8a (patch) | |
tree | 870cf02627d508c38c1a5af7d080fa7051a19b2d | |
parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) |
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>
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 6 |
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) | |||
267 | index = NVKM_I2C_BUS_PRI; | 267 | index = NVKM_I2C_BUS_PRI; |
268 | if (init->outp && init->outp->i2c_upper_default) | 268 | if (init->outp && init->outp->i2c_upper_default) |
269 | index = NVKM_I2C_BUS_SEC; | 269 | index = NVKM_I2C_BUS_SEC; |
270 | } else | ||
271 | if (index == 0x80) { | ||
272 | index = NVKM_I2C_BUS_PRI; | ||
273 | } else | ||
274 | if (index == 0x81) { | ||
275 | index = NVKM_I2C_BUS_SEC; | ||
270 | } | 276 | } |
271 | 277 | ||
272 | bus = nvkm_i2c_bus_find(i2c, index); | 278 | bus = nvkm_i2c_bus_find(i2c, index); |