projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4d1defd)
drm/nouveau: Fix DCB TMDS config parsing.
authorFrancisco Jerez <currojerez@riseup.net>
Sun, 8 Aug 2010 15:09:06 +0000 (17:09 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 9 Aug 2010 05:17:02 +0000 (15:17 +1000)
Thinko caused by 43bda05428a3d2021f3c12220073e0251c65df8b.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
drivers/gpu/drm/nouveau/nouveau_bios.c patch | blob | blame | history

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 6df8b3fbe746e310dd1d0f99ccc9138f37ca0794..0b69a9628c95dee9585584672a1ec9f820aa600e 100644 (file)
--- 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: