summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-07-27 14:18:03 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-08-14 09:36:50 +1000
commit3d7a1da2c2bddb916450b1a124a9bcd9c507bdce (patch)
treee7f769eedf79a96360d2a71b9be5a38d468d59c2
parentaf5e7d84b0ec45b2b614b0d6e3657cbdceaa21f9 (diff)
downloadlinux-3.10-3d7a1da2c2bddb916450b1a124a9bcd9c507bdce.tar.gz
linux-3.10-3d7a1da2c2bddb916450b1a124a9bcd9c507bdce.tar.bz2
linux-3.10-3d7a1da2c2bddb916450b1a124a9bcd9c507bdce.zip
drm/nouveau/aux: mask off higher bits of auxch index in i2c table entry
At least partially fixes DP output detection on W530. Not sure if more issues remain, or if my adaptor is just behaving weirdly (it does that sometimes). In any case, this patch is necessary. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c
index 77e564667b5..240cf962c99 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c
@@ -229,7 +229,7 @@ nouveau_i2c_init(struct drm_device *dev)
}
break;
case 6: /* NV50- DP AUX */
- port->drive = entry[0];
+ port->drive = entry[0] & 0x0f;
port->sense = port->drive;
port->adapter.algo = &nouveau_dp_i2c_algo;
break;