diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2016-08-31 17:31:30 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-02 10:34:47 -0400 |
commit | 5e0b1617fc38a27cf494c5d0b51f08de77ce0d20 (patch) | |
tree | 5da3f377227374527a84d204c67cdd8fb4c8bb88 | |
parent | 103917b387ba9b72114d494fb29e012f51b4be3e (diff) |
drm/radeon: 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>
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index a00dd2f74527..cfb3e4fee24b 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
@@ -1594,7 +1594,8 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, | |||
1594 | 1594 | ||
1595 | rdev = dev->dev_private; | 1595 | rdev = dev->dev_private; |
1596 | 1596 | ||
1597 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) | 1597 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF || |
1598 | dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF) | ||
1598 | return 0; | 1599 | return 0; |
1599 | 1600 | ||
1600 | drm_kms_helper_poll_disable(dev); | 1601 | drm_kms_helper_poll_disable(dev); |
@@ -1689,7 +1690,8 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) | |||
1689 | struct drm_crtc *crtc; | 1690 | struct drm_crtc *crtc; |
1690 | int r; | 1691 | int r; |
1691 | 1692 | ||
1692 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) | 1693 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF || |
1694 | dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF) | ||
1693 | return 0; | 1695 | return 0; |
1694 | 1696 | ||
1695 | if (fbcon) { | 1697 | if (fbcon) { |