diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-09-19 12:20:18 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-19 13:22:07 -0400 |
| commit | f2aba352a954d962c434c059cb080eb935537e45 (patch) | |
| tree | 53b09a93182b520b82a16426110b6909781b4481 /drivers/gpu | |
| parent | e313de7e89978012afec5953068052cbb42134a3 (diff) | |
Revert "drm/radeon: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF"
This is not necessary as pointed out by Lukas Wunner.
This reverts commit 5e0b1617fc38a27cf494c5d0b51f08de77ce0d20.
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index b423c0159581..bbc895891631 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
| @@ -1594,8 +1594,7 @@ 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) | ||
| 1599 | return 0; | 1598 | return 0; |
| 1600 | 1599 | ||
| 1601 | drm_kms_helper_poll_disable(dev); | 1600 | drm_kms_helper_poll_disable(dev); |
| @@ -1690,8 +1689,7 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) | |||
| 1690 | struct drm_crtc *crtc; | 1689 | struct drm_crtc *crtc; |
| 1691 | int r; | 1690 | int r; |
| 1692 | 1691 | ||
| 1693 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF || | 1692 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) |
| 1694 | dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF) | ||
| 1695 | return 0; | 1693 | return 0; |
| 1696 | 1694 | ||
| 1697 | if (fbcon) { | 1695 | if (fbcon) { |