---

yaml --- r: 263599 b: refs/heads/master c: 302a8e8 h: refs/heads/master i: 263597: b6f8879 263595: ac9cf2a 263591: d28f971 263583: f7871de v: v3
git-mirror · Aug 30, 2011 · 3c1a7c6 · 3c1a7c6
1 parent 533849d
commit 3c1a7c6
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: 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
@@ -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)