From: Francisco Jerez Date: Sun, 8 Aug 2010 15:09:06 +0000 (+0200) Subject: drm/nouveau: Fix DCB TMDS config parsing. X-Git-Tag: MMI-PSA29.97-13-9~22407^2~4^2~23 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=27d50fcc9ac7a39a4ab3107a619ee60ed05c6de8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/nouveau: Fix DCB TMDS config parsing. Thinko caused by 43bda05428a3d2021f3c12220073e0251c65df8b. Signed-off-by: Francisco Jerez --- 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: