diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-07-16 02:17:27 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-25 21:41:50 -0400 |
commit | c58754703c7d448c94aebf5e500d4278f6fc0678 (patch) | |
tree | fdc69a4d75f9fa86c6745dacd5d83254217b5d41 /drivers/gpu/drm/nouveau | |
parent | a6ed76d7ffc62ffa474b41d31b011b6853c5de32 (diff) |
drm/nv50: fix regression that break LVDS in some places
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 256c6ed7d9e0..0eb1b5ad0db1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c | |||
@@ -5627,6 +5627,7 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb, | |||
5627 | entry->lvdsconf.use_acpi_for_edid = true; | 5627 | entry->lvdsconf.use_acpi_for_edid = true; |
5628 | if (conf & 0x4) | 5628 | if (conf & 0x4) |
5629 | entry->lvdsconf.use_power_scripts = true; | 5629 | entry->lvdsconf.use_power_scripts = true; |
5630 | entry->lvdsconf.sor.link = (conf & 0x00000030) >> 4; | ||
5630 | } | 5631 | } |
5631 | if (conf & mask) { | 5632 | if (conf & mask) { |
5632 | /* | 5633 | /* |