summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-05-12 14:45:04 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-05-19 16:22:07 +1000
commit04f542c07e9376c732c72b40de7cdc71801f8cd5 (patch)
treed56d8582ec3d71b1f4bda5f0e311f4dfb56c77c5 /drivers/gpu
parentf8b0be1a75dc62d2b5f5b9a8406c97d6c5f82b7d (diff)
downloadlinux-04f542c07e9376c732c72b40de7cdc71801f8cd5.tar.bz2
drm/nouveau: support init table i2c device identifier 0x81
It appears to be meant to reference the second "default index". Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bios.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index b0b98d7f4ea9..327f6f34d78d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -810,6 +810,9 @@ init_i2c_device_find(struct drm_device *dev, int i2c_index)
}
if (i2c_index == 0x80) /* g80+ */
i2c_index = dcb->i2c_default_indices & 0xf;
+ else
+ if (i2c_index == 0x81)
+ i2c_index = (dcb->i2c_default_indices & 0xf0) >> 4;
if (i2c_index > DCB_MAX_NUM_I2C_ENTRIES) {
NV_ERROR(dev, "invalid i2c_index 0x%x\n", i2c_index);