From 3c1a7c63c466e98d16c1ad3736d33f3a1dd45f6b Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 29 Aug 2011 14:55:25 +0000
Subject: [PATCH] --- yaml --- r: 263599 b: refs/heads/master c:
 302a8e8b06d312dcb3b718dfeb42aa912b5f426b h: refs/heads/master i:   263597:
 b6f88796cd0bcc338503a49e9f3e75ed8fe79aeb   263595:
 ac9cf2a3967eab484df91601a95928c2556210bf   263591:
 d28f9719925602999168a1f3c9f975222ba36d48   263583:
 f7871deb2b61ae84423c64d87ea2c5c5572d4152 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_combios.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7d6d338bc12e..0c2a6ee6a106 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a49a50dad48586d42ebac1a6730c3a3cd5603421
+refs/heads/master: 302a8e8b06d312dcb3b718dfeb42aa912b5f426b
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_combios.c b/trunk/drivers/gpu/drm/radeon/radeon_combios.c
index e0138b674aca..63675241c7ff 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_combios.c
@@ -3298,6 +3298,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)