diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-09-19 12:17:22 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-19 13:22:06 -0400 |
| commit | e313de7e89978012afec5953068052cbb42134a3 (patch) | |
| tree | 7214467546cbc7c06549f5529cc13140b148bf80 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | 02124a03e60d8526ad8da19d276e8b2b77be28fb (diff) | |
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.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -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 3ddae5ff41bb..377d81875c6d 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) | |||
| 1842 | 1842 | ||
| 1843 | adev = dev->dev_private; | 1843 | adev = dev->dev_private; |
| 1844 | 1844 | ||
| 1845 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF || | 1845 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) |
| 1846 | dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF) | ||
| 1847 | return 0; | 1846 | return 0; |
| 1848 | 1847 | ||
| 1849 | drm_kms_helper_poll_disable(dev); | 1848 | drm_kms_helper_poll_disable(dev); |
| @@ -1928,8 +1927,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) | |||
| 1928 | struct drm_crtc *crtc; | 1927 | struct drm_crtc *crtc; |
| 1929 | int r; | 1928 | int r; |
| 1930 | 1929 | ||
| 1931 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF || | 1930 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) |
| 1932 | dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF) | ||
| 1933 | return 0; | 1931 | return 0; |
| 1934 | 1932 | ||
| 1935 | if (fbcon) | 1933 | if (fbcon) |