diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-03-20 10:50:02 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-03-20 10:50:02 -0400 |
| commit | 1cb8484ca2ae49bf2807be05d112188b9db0c5af (patch) | |
| tree | e81e6a04e1d3989e3b725bcf52e07fbce5c9ea97 /drivers/gpu/drm | |
| parent | 2bd876f7e5ea250edb9221f28a60a27fd13484fc (diff) | |
| parent | b86163d5a3c2f913bc5546770d3a6b6a2dd3698b (diff) | |
Merge tag 'v3.0.69' into v3.0-rt
This is the 3.0.69 stable release
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_combios.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 2157e770d35a..98fb3d73f36e 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -958,6 +958,15 @@ struct radeon_encoder_primary_dac *radeon_combios_get_primary_dac_info(struct found = 1; } + /* quirks */ + /* Radeon 9100 (R200) */ + if ((dev->pdev->device == 0x514D) && + (dev->pdev->subsystem_vendor == 0x174B) && + (dev->pdev->subsystem_device == 0x7149)) { + /* vbios value is bad, use the default */ + found = 0; + } + if (!found) /* fallback to defaults */ radeon_legacy_get_primary_dac_info_from_table(rdev, p_dac); |