summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-08-08 17:09:06 +0200
committerBen Skeggs <bskeggs@redhat.com>2010-08-09 15:17:02 +1000
commit27d50fcc9ac7a39a4ab3107a619ee60ed05c6de8 (patch)
tree474340665b89330e0a01ff5ae406558d389884ee
parent4d1defd724485bb4cbecdcccf5c3fee5cd6a0d41 (diff)
downloadlinux-27d50fcc9ac7a39a4ab3107a619ee60ed05c6de8.tar.bz2
drm/nouveau: Fix DCB TMDS config parsing.
Thinko caused by 43bda05428a3d2021f3c12220073e0251c65df8b. Signed-off-by: Francisco Jerez <currojerez@riseup.net>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bios.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 6df8b3fbe746..0b69a9628c95 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -6131,12 +6131,12 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb,
}
break;
case OUTPUT_TMDS:
- if (dcb->version >= 0x22)
- entry->tmdsconf.slave_addr = (conf & 0x00000070) >> 4;
+ if (dcb->version >= 0x40)
+ entry->tmdsconf.sor.link = (conf & 0x00000030) >> 4;
else if (dcb->version >= 0x30)
entry->tmdsconf.slave_addr = (conf & 0x00000700) >> 8;
- else if (dcb->version >= 0x40)
- entry->tmdsconf.sor.link = (conf & 0x00000030) >> 4;
+ else if (dcb->version >= 0x22)
+ entry->tmdsconf.slave_addr = (conf & 0x00000070) >> 4;
break;
case 0xe: