]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Revert "drm/radeon: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF"
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 19 Sep 2016 16:20:18 +0000 (12:20 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 19 Sep 2016 17:22:07 +0000 (13:22 -0400)
This is not necessary as pointed out by Lukas Wunner.

This reverts commit 5e0b1617fc38a27cf494c5d0b51f08de77ce0d20.

drivers/gpu/drm/radeon/radeon_device.c

index b423c015958125b6bacf6242d83b32a5c38d196f..bbc8958916319ff35632bbae03ee92924b416239 100644 (file)
@@ -1594,8 +1594,7 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend,
 
        rdev = 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);
@@ -1690,8 +1689,7 @@ int radeon_resume_kms(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) {