diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-03-18 13:12:31 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-18 13:12:31 +0400 |
| commit | bcc298bc924e0a990f853ba3e19f8b5a833cba7e (patch) | |
| tree | 1c87c8f73dc41fd11ee3dacb1b91a7cc8b4798bb /drivers/gpu/drm/radeon/radeon_device.c | |
| parent | 978c6050165bba52eab7ef3581d447eb215def77 (diff) | |
| parent | dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 (diff) | |
| download | linux-bcc298bc924e0a990f853ba3e19f8b5a833cba7e.tar.xz | |
Merge tag 'v3.14-rc7' into drm-next
Linux 3.14-rc7
Backmerge to help out Intel guys.
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_device.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 7db44de90d6c..2e72dcd94b13 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1517,13 +1517,16 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) if (r) DRM_ERROR("ib ring test failed (%d).\n", r); - if (rdev->pm.dpm_enabled) { + if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled) { /* do dpm late init */ r = radeon_pm_late_init(rdev); if (r) { rdev->pm.dpm_enabled = false; DRM_ERROR("radeon_pm_late_init failed, disabling dpm\n"); } + } else { + /* resume old pm late */ + radeon_pm_resume(rdev); } radeon_restore_bios_scratch_regs(rdev); |