aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-06-03 17:10:33 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-07-07 14:51:13 -0400
commitbdfb76040068d960cb9e226876be8a508d741c4a (patch)
tree1dd41f3be38a430051e9912adb02d4c4e46ded03 /drivers/gpu/drm/radeon
parentdrm/amdgpu: work around lack of upstream ACPI support for D3cold (diff)
downloadlinux-dev-bdfb76040068d960cb9e226876be8a508d741c4a.tar.xz
linux-dev-bdfb76040068d960cb9e226876be8a508d741c4a.zip
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>
Diffstat (limited to 'drivers/gpu/drm/radeon')
-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 de17b5ed3ea4..86dcdf38b732 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;
}