diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-06-30 07:26:11 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-01 05:59:41 +0400 |
| commit | 580b4fffbbdc3c899ee1f8189ba321bd60b48840 (patch) | |
| tree | 3d34858563fa16b53dcc1001600c3f1c7ae9e10a /drivers/gpu/drm/radeon/radeon_combios.c | |
| parent | 60a4a3e0ce0b575e8b4cb6bf39d2c40e403bdfc7 (diff) | |
| download | linux-580b4fffbbdc3c899ee1f8189ba321bd60b48840.tar.xz | |
drm/radeon: add quirk to make HP nx6125 laptop resume.
For some reason on resume, executing the BIOS scripts locks up the whole chipset, by avoiding the dynclk table the machine resumes properly and seems to function okay.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_combios.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_combios.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 08e156a7e4d4..392bc4d68a4d 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -3051,6 +3051,14 @@ void radeon_combios_asic_init(struct drm_device *dev) combios_write_ram_size(dev); } + /* quirk for rs4xx HP nx6125 laptop to make it resume + * - it hangs on resume inside the dynclk 1 table. + */ + if (rdev->family == CHIP_RS480 && + rdev->pdev->subsystem_vendor == 0x103c && + rdev->pdev->subsystem_device == 0x308b) + return; + /* DYN CLK 1 */ table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE); if (table) |