---

yaml --- r: 201167 b: refs/heads/master c: 52fa2bb h: refs/heads/master i: 201165: 0068356 201163: af07706 201159: ef7dedf 201151: 17bac3a v: v3
git-mirror · Jul 22, 2010 · 036cd5c · 036cd5c
1 parent 97bdcff
commit 036cd5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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)