aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_bios.c
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-08-08 11:09:06 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-08-09 01:17:02 -0400
commit27d50fcc9ac7a39a4ab3107a619ee60ed05c6de8 (patch)
tree474340665b89330e0a01ff5ae406558d389884ee /drivers/gpu/drm/nouveau/nouveau_bios.c
parent4d1defd724485bb4cbecdcccf5c3fee5cd6a0d41 (diff)
drm/nouveau: Fix DCB TMDS config parsing.
Thinko caused by 43bda05428a3d2021f3c12220073e0251c65df8b. Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.c')
-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,
6131 } 6131 }
6132 break; 6132 break;
6133 case OUTPUT_TMDS: 6133 case OUTPUT_TMDS:
6134 if (dcb->version >= 0x22) 6134 if (dcb->version >= 0x40)
6135 entry->tmdsconf.slave_addr = (conf & 0x00000070) >> 4; 6135 entry->tmdsconf.sor.link = (conf & 0x00000030) >> 4;
6136 else if (dcb->version >= 0x30) 6136 else if (dcb->version >= 0x30)
6137 entry->tmdsconf.slave_addr = (conf & 0x00000700) >> 8; 6137 entry->tmdsconf.slave_addr = (conf & 0x00000700) >> 8;
6138 else if (dcb->version >= 0x40) 6138 else if (dcb->version >= 0x22)
6139 entry->tmdsconf.sor.link = (conf & 0x00000030) >> 4; 6139 entry->tmdsconf.slave_addr = (conf & 0x00000070) >> 4;
6140 6140
6141 break; 6141 break;
6142 case 0xe: 6142 case 0xe: