diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-09-19 16:17:22 (GMT) |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-19 17:22:06 (GMT) |
| commit | e313de7e89978012afec5953068052cbb42134a3 (patch) | |
| tree | 7214467546cbc7c06549f5529cc13140b148bf80 | |
| parent | 02124a03e60d8526ad8da19d276e8b2b77be28fb (diff) | |
| download | linux-e313de7e89978012afec5953068052cbb42134a3.tar.xz | |
Revert "drm/amdgpu: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF"
This is not necessary as pointed out by Lukas Wunner.
This reverts commit f46cf3735f4c05eb752d020d34ace1c85ccf567c.
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 3ddae5f..377d818 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1842,8 +1842,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon) adev = dev->dev_private; - if (dev->switch_power_state == DRM_SWITCH_POWER_OFF || - dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF) + if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) return 0; drm_kms_helper_poll_disable(dev); @@ -1928,8 +1927,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) struct drm_crtc *crtc; int r; - if (dev->switch_power_state == DRM_SWITCH_POWER_OFF || - dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF) + if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) return 0; if (fbcon) |