From: Alex Deucher Date: Mon, 29 Aug 2011 14:55:25 +0000 (+0000) Subject: drm/radeon/kms: add s/r quirk for Compaq Presario V5245EU X-Git-Tag: firefly_0821_release~7541^2~2822 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=795464a57a2a7c342ccdc0939647d45dabd24668;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman --- 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)