summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffery Miller <jmiller@neverware.com>2015-09-01 11:23:02 -0400
committerBen Hutchings <ben@decadent.org.uk>2015-10-13 03:46:07 +0100
commited2a4a92f525d3b70c251dcd82e3e3a2d562b338 (patch)
tree605418add296117fdc03a1666f30037287f6fd54
parent843ab6d0bd0005c655d84c4ceb445ac97f3ffe6d (diff)
downloadlinux-stable-ed2a4a92f525d3b70c251dcd82e3e3a2d562b338.tar.gz
linux-stable-ed2a4a92f525d3b70c251dcd82e3e3a2d562b338.tar.bz2
linux-stable-ed2a4a92f525d3b70c251dcd82e3e3a2d562b338.zip
Add radeon suspend/resume quirk for HP Compaq dc5750.
commit 09bfda10e6efd7b65bcc29237bee1765ed779657 upstream. With the radeon driver loaded the HP Compaq dc5750 Small Form Factor machine fails to resume from suspend. Adding a quirk similar to other devices avoids the problem and the system resumes properly. Signed-off-by: Jeffery Miller <jmiller@neverware.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/gpu/drm/radeon/radeon_combios.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index 21e689dbfa26..87a677e91927 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -3399,6 +3399,14 @@ void radeon_combios_asic_init(struct drm_device *dev)
rdev->pdev->subsystem_device == 0x30ae)
return;
+ /* quirk for rs4xx HP Compaq dc5750 Small Form Factor 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 == 0x280a)
+ return;
+
/* DYN CLK 1 */
table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);
if (table)