Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c940b447 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: fix pm handling in radeon_gpu_reset 



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: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
parent 1538a9e0

drivers/gpu/drm/radeon/radeon_device.c

+16 −2
Original line number Diff line number Diff line
@@ -1680,7 +1680,6 @@ int radeon_gpu_reset(struct radeon_device *rdev) 
	radeon_save_bios_scratch_regs(rdev);

	/* block TTM */

	resched = ttm_bo_lock_delayed_workqueue(&rdev->mman.bdev);

	radeon_pm_suspend(rdev);

	radeon_suspend(rdev);



	for (i = 0; i < RADEON_NUM_RINGS; ++i) {
@@ -1726,9 +1725,24 @@ int radeon_gpu_reset(struct radeon_device *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(&rdev->mman.bdev, resched);

	if (r) {

		/* bad news, how to tell it to userspace ? */