summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2011-08-29 14:55:25 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-03 11:40:02 -0700
commit795464a57a2a7c342ccdc0939647d45dabd24668 (patch)
tree3d9d3e1c9fc4240c55932f7363f35b3abd92e518
parentf7ae5caa73f0f1b226da2dae7403e7d12d58db26 (diff)
downloadlwn-795464a57a2a7c342ccdc0939647d45dabd24668.tar.gz
lwn-795464a57a2a7c342ccdc0939647d45dabd24668.zip
drm/radeon/kms: add s/r quirk for Compaq Presario V5245EU
commit 302a8e8b06d312dcb3b718dfeb42aa912b5f426b upstream. Fixes resume on Compaq Presario V5245EU. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=41642 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/gpu/drm/radeon/radeon_combios.c8
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 a74217cd192f..cd3c86c845e4 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -3279,6 +3279,14 @@ void radeon_combios_asic_init(struct drm_device *dev)
rdev->pdev->subsystem_device == 0x30a4)
return;
+ /* quirk for rs4xx Compaq Presario V5245EU 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 == 0x30ae)
+ return;
+
/* DYN CLK 1 */
table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);
if (table)