From 036cd5c4cfc9e7bc040293e6d7db26df7bb8502d Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Wed, 21 Jul 2010 23:54:35 -0400
Subject: [PATCH] --- yaml --- r: 201167 b: refs/heads/master c:
 52fa2bbc8ec46255039e2048d616bbd0852ee292 h: refs/heads/master i:   201165:
 0068356588803e7720d70f2e550d5da3989b340a   201163:
 af0770629d179d4539999a1d1d9062886b88dc97   201159:
 ef7dedfd1dc4d43013a591dd602232e1d161d138   201151:
 17bac3a5965972f4e251ef3a7b076c1b1d7c7b50 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 b52170b8deb3..5d41bd3ecefb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0baf2d8fe43fdd81faa30e65ff71785c99c78520
+refs/heads/master: 52fa2bbc8ec46255039e2048d616bbd0852ee292
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_combios.c b/trunk/drivers/gpu/drm/radeon/radeon_combios.c
index d1c1d8dd93ce..2417d7b06fdb 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_combios.c
@@ -3050,6 +3050,14 @@ void radeon_combios_asic_init(struct drm_device *dev)
 	    rdev->pdev->subsystem_device == 0x308b)
 		return;
 
+	/* quirk for rs4xx HP dv5000 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 == 0x30a4)
+		return;
+
 	/* DYN CLK 1 */
 	table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);
 	if (table)