diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2016-08-27 12:57:20 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-02 10:34:45 -0400 |
commit | f46cf3735f4c05eb752d020d34ace1c85ccf567c (patch) | |
tree | 741b97e1f4183a43203fa1135c46acf7bb66566c /drivers/gpu/drm/amd/amdgpu | |
parent | 85e154c22e3c29d4db52ccc1c1cc58a2cadc103b (diff) |
drm/amdgpu: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
Missed this case previously. No need to do anything if the
device is already off. runtime pm will handle it.
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index c2459abb408d..1aa0364d7961 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -1839,7 +1839,8 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon) | |||
1839 | 1839 | ||
1840 | adev = dev->dev_private; | 1840 | adev = dev->dev_private; |
1841 | 1841 | ||
1842 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) | 1842 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF || |
1843 | dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF) | ||
1843 | return 0; | 1844 | return 0; |
1844 | 1845 | ||
1845 | drm_kms_helper_poll_disable(dev); | 1846 | drm_kms_helper_poll_disable(dev); |
@@ -1920,7 +1921,8 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) | |||
1920 | struct drm_crtc *crtc; | 1921 | struct drm_crtc *crtc; |
1921 | int r; | 1922 | int r; |
1922 | 1923 | ||
1923 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) | 1924 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF || |
1925 | dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF) | ||
1924 | return 0; | 1926 | return 0; |
1925 | 1927 | ||
1926 | if (fbcon) { | 1928 | if (fbcon) { |