[PATCH 2/9] drm/radeon: fix pm handling in radeon_gpu_reset

[Christian König]

From: Alex Deucher 

pm_suspend is handled in the radeon_suspend callbacks.
pm_resume has special handling depending on whether
dpm or legacy pm is enabled.  Change radeon_gpu_reset
to mirror the behavior in the suspend and resume
paths.

Signed-off-by: Alex Deucher 
Reviewed-by: Christian K?nig 
Reviewed-by: Maarten Lankhorst 
Cc: stable at vger.kernel.org
---
 drivers/gpu/drm/radeon/radeon_device.c | 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_device.c 
b/drivers/gpu/drm/radeon/radeon_device.c
index 152181d..d2ff12e 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1682,7 +1682,6 @@ int radeon_gpu_reset(struct radeon_device *rdev)
radeon_save_bios_scratch_regs(rdev);
/* block TTM */
resched = ttm_bo_lock_delayed_workqueue(>mman.bdev);
-   radeon_pm_suspend(rdev);
radeon_suspend(rdev);

for (i = 0; i < RADEON_NUM_RINGS; ++i) {
@@ -1728,9 +1727,24 @@ retry:
}
}

-   radeon_pm_resume(rdev);
+   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);
+   }
+
drm_helper_resume_force_mode(rdev->ddev);

+   /* set the power state here in case we are a PX system or headless */
+   if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled)
+   radeon_pm_compute_clocks(rdev);
+
ttm_bo_unlock_delayed_workqueue(>mman.bdev, resched);
if (r) {
/* bad news, how to tell it to userspace ? */
-- 
1.9.1

[PATCH 2/9] drm/radeon: fix pm handling in radeon_gpu_reset

[Christian König]

From: Alex Deucher 

pm_suspend is handled in the radeon_suspend callbacks.
pm_resume has special handling depending on whether
dpm or legacy pm is enabled.  Change radeon_gpu_reset
to mirror the behavior in the suspend and resume
pathes.

Signed-off-by: Alex Deucher 
Reviewed-by: Christian K?nig 
Cc: stable at vger.kernel.org
---
 drivers/gpu/drm/radeon/radeon_device.c | 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_device.c 
b/drivers/gpu/drm/radeon/radeon_device.c
index 152181d..d2ff12e 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1682,7 +1682,6 @@ int radeon_gpu_reset(struct radeon_device *rdev)
radeon_save_bios_scratch_regs(rdev);
/* block TTM */
resched = ttm_bo_lock_delayed_workqueue(>mman.bdev);
-   radeon_pm_suspend(rdev);
radeon_suspend(rdev);

for (i = 0; i < RADEON_NUM_RINGS; ++i) {
@@ -1728,9 +1727,24 @@ retry:
}
}

-   radeon_pm_resume(rdev);
+   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);
+   }
+
drm_helper_resume_force_mode(rdev->ddev);

+   /* set the power state here in case we are a PX system or headless */
+   if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled)
+   radeon_pm_compute_clocks(rdev);
+
ttm_bo_unlock_delayed_workqueue(>mman.bdev, resched);
if (r) {
/* bad news, how to tell it to userspace ? */
-- 
1.9.1