drm/nv50: fix regression that break LVDS in some places
authorBen Skeggs <bskeggs@redhat.com>
Fri, 16 Jul 2010 06:17:27 +0000 (16:17 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 26 Jul 2010 01:41:50 +0000 (11:41 +1000)
A previous commit started additionally using the SOR link when trying to
match the correct output script.  However, we never fill in this field
for LVDS so we can never match a script at all.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_bios.c

index 256c6ed7d9e0f51890c70a077731a09315e572b1..0eb1b5ad0db117e9b2cd43dbe25fcd31541d51d4 100644 (file)
@@ -5627,6 +5627,7 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb,
                                entry->lvdsconf.use_acpi_for_edid = true;
                        if (conf & 0x4)
                                entry->lvdsconf.use_power_scripts = true;
+                       entry->lvdsconf.sor.link = (conf & 0x00000030) >> 4;
                }
                if (conf & mask) {
                        /*