diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2016-08-09 00:21:45 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-09 00:21:45 -0400 |
commit | b817634276f7f68c9d1d6d4a27117ff3c2f16956 (patch) | |
tree | 57b4b3ea1dc00811fd89b3bd603fd1a4dbfbdaa7 | |
parent | c39b487f195b93235ee76384427467786f7bf29f (diff) | |
download | op-kernel-dev-b817634276f7f68c9d1d6d4a27117ff3c2f16956.zip op-kernel-dev-b817634276f7f68c9d1d6d4a27117ff3c2f16956.tar.gz |
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.
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_atpx_handler.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c index 6de3428..ddef0d4 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; } |