aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffery Miller <jmiller@neverware.com>2015-09-01 11:23:02 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-01 12:07:30 +0200
commit1d6c45737c391f980df36e9183f81f8b19632d37 (patch)
tree8f9b7378fe15824d5861c6590c1939f8da152b46
parent2ba90c0e0638dba68ffe6e78b135729e41a4540a (diff)
downloadlinux-linaro-stable-1d6c45737c391f980df36e9183f81f8b19632d37.tar.gz
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 8cac69819054..9c64a973190e 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -3403,6 +3403,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)