Revert "drm/amdgpu: work around lack of upstream ACPI support for D3cold"
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 9 Aug 2016 04:20:28 +0000 (00:20 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 9 Aug 2016 04:20:28 +0000 (00:20 -0400)
This reverts commit c63695cc5e5f685e924e25a8f9555f6e846f1fc6.

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

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=97248

drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c

index 49de92600074dd3f16f117553ae44368b6b1d0d8..10b5ddf2c5887c36fd7f5d03f4ff6038c8e3cb8a 100644 (file)
@@ -200,16 +200,7 @@ static int amdgpu_atpx_validate(struct amdgpu_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;
        }