diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-07-16 16:17:27 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-26 11:41:50 +1000 |
| commit | c58754703c7d448c94aebf5e500d4278f6fc0678 (patch) | |
| tree | fdc69a4d75f9fa86c6745dacd5d83254217b5d41 | |
| parent | a6ed76d7ffc62ffa474b41d31b011b6853c5de32 (diff) | |
| download | linux-c58754703c7d448c94aebf5e500d4278f6fc0678.tar.gz linux-c58754703c7d448c94aebf5e500d4278f6fc0678.tar.bz2 linux-c58754703c7d448c94aebf5e500d4278f6fc0678.zip | |
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>
| -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, 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) { /* |