aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffery Miller <jmiller@neverware.com>2015-09-01 11:23:02 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-09-02 12:19:52 -0400
commit09bfda10e6efd7b65bcc29237bee1765ed779657 (patch)
treea9a13a3da8299df401fdd024a3414e1aa5e5d805
parent423a9480add9d9afba035d3c2617034d5f766065 (diff)
Add radeon suspend/resume quirk for HP Compaq dc5750.
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> Cc: stable@vger.kernel.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 c097d3a82bda..a9b01bcf7d0a 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -3387,6 +3387,14 @@ void radeon_combios_asic_init(struct drm_device *dev)
3387 rdev->pdev->subsystem_device == 0x30ae) 3387 rdev->pdev->subsystem_device == 0x30ae)
3388 return; 3388 return;
3389 3389
3390 /* quirk for rs4xx HP Compaq dc5750 Small Form Factor to make it resume
3391 * - it hangs on resume inside the dynclk 1 table.
3392 */
3393 if (rdev->family == CHIP_RS480 &&
3394 rdev->pdev->subsystem_vendor == 0x103c &&
3395 rdev->pdev->subsystem_device == 0x280a)
3396 return;
3397
3390 /* DYN CLK 1 */ 3398 /* DYN CLK 1 */
3391 table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE); 3399 table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);
3392 if (table) 3400 if (table)