From a8eda322bd184d3cd78fb6ceca4d05dfe5de4a7a Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 12 May 2010 14:45:04 +1000 Subject: [PATCH] --- yaml --- r: 196578 b: refs/heads/master c: 04f542c07e9376c732c72b40de7cdc71801f8cd5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 96b5924686e0..db4b0f97800b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8b0be1a75dc62d2b5f5b9a8406c97d6c5f82b7d +refs/heads/master: 04f542c07e9376c732c72b40de7cdc71801f8cd5 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c index b0b98d7f4ea9..327f6f34d78d 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/trunk/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);