summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-06-03 21:10:33 (GMT)
committerAlex Deucher <alexander.deucher@amd.com>2016-07-07 18:51:13 (GMT)
commitbdfb76040068d960cb9e226876be8a508d741c4a (patch)
tree1dd41f3be38a430051e9912adb02d4c4e46ded03
parentc63695cc5e5f685e924e25a8f9555f6e846f1fc6 (diff)
downloadlinux-bdfb76040068d960cb9e226876be8a508d741c4a.tar.xz
drm/radeon: work around lack of upstream ACPI support for D3cold
Until Dave's patch to support the new hybrid gfx ACPI method goes upstream, we can fallback to the old ATPX method which seems to still work. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_atpx_handler.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index de17b5e..86dcdf3 100644
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -198,7 +198,16 @@ static int radeon_atpx_validate(struct radeon_atpx *atpx)
atpx->is_hybrid = false;
if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {
printk("ATPX Hybrid Graphics\n");
+#if 1
+ /* This is a temporary hack until the D3 cold support
+ * makes it upstream. The ATPX power_control method seems
+ * to still work on even if the system should be using
+ * the new standardized hybrid D3 cold ACPI interface.
+ */
+ atpx->functions.power_cntl = true;
+#else
atpx->functions.power_cntl = false;
+#endif
atpx->is_hybrid = true;
}