From: Alex Deucher <alexander.deucher@amd.com>
Date: Tue, 9 Aug 2016 04:21:45 +0000 (-0400)
Subject: Revert "drm/radeon: work around lack of upstream ACPI support for D3cold"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b817634276f7f68c9d1d6d4a27117ff3c2f16956;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Revert "drm/radeon: work around lack of upstream ACPI support for D3cold"

This reverts commit bdfb76040068d960cb9e226876be8a508d741c4a.

Now that d3cold is upstream, there is no more need for this workaround.
---

diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index 6de342861202..ddef0d494084 100644
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -198,16 +198,7 @@ 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;
 	}