This is a note to let you know that I've just added the patch titled
drm/radeon: fix pm handling in radeon_gpu_reset
to the 3.16-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-radeon-fix-pm-handling-in-radeon_gpu_reset.patch
and it can be found in the queue-3.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c940b4476f4fb649f6493b6a0ae837474ded8915 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Mon, 18 Aug 2014 11:57:28 -0400
Subject: drm/radeon: fix pm handling in radeon_gpu_reset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit c940b4476f4fb649f6493b6a0ae837474ded8915 upstream.
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 <alexander.deucher@xxxxxxx>
Reviewed-by: Christian König <christian.koenig@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/radeon_device.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1637,7 +1637,6 @@ int radeon_gpu_reset(struct radeon_devic
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) {
@@ -1683,9 +1682,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(&rdev->mman.bdev, resched);
if (r) {
/* bad news, how to tell it to userspace ? */
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-3.16/drm-radeon-tweak-accel_working2-query-for-hawaii.patch
queue-3.16/drm-radeon-atom-add-new-voltage-fetch-function-for-hawaii.patch
queue-3.16/drm-radeon-don-t-reset-dma-on-ni-si-init.patch
queue-3.16/drm-radeon-dpm-fix-resume-on-mullins.patch
queue-3.16/drm-radeon-don-t-reset-sdma-on-cik-init.patch
queue-3.16/drm-radeon-fix-pm-handling-in-radeon_gpu_reset.patch
queue-3.16/drm-radeon-fix-semaphore-value-init.patch
queue-3.16/drm-radeon-add-missing-lines-to-ci_set_thermal_temperature_range.patch
queue-3.16/drm-radeon-fix-active_cu-mask-on-si-and-cik-after-re-init-v3.patch
queue-3.16/drm-radeon-dpm-handle-voltage-info-fetching-on-hawaii.patch
queue-3.16/drm-radeon-re-enable-dpm-by-default-on-btc.patch
queue-3.16/drm-radeon-properly-document-reloc-priority-mask.patch
queue-3.16/drm-radeon-handle-broken-disabled-rb-mask-gracefully-6xx-7xx-v2.patch
queue-3.16/drm-radeon-fix-active-cu-count-for-si-and-cik.patch
queue-3.16/drm-radeon-dpm-select-the-appropriate-vce-power-state-for-kv-kb-ml.patch
queue-3.16/drm-radeon-re-enable-dpm-by-default-on-cayman.patch
queue-3.16/drm-radeon-set-vm-base-addr-using-the-pfp-v2.patch
queue-3.16/drm-radeon-add-connector-quirk-for-fujitsu-board.patch
queue-3.16/drm-radeon-add-ability-to-get-and-change-dpm-state-when-radeon-px-card-is-turned-off.patch
queue-3.16/drm-radeon-cik-use-a-separate-counter-for-cp-init-timeout.patch
queue-3.16/drm-radeon-load-the-lm63-driver-for-an-lm64-thermal-chip.patch
queue-3.16/drm-radeon-dpm-set-the-thermal-type-properly-for-special-configs.patch
queue-3.16/drm-radeon-don-t-reset-dma-on-r6xx-evergreen-init.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html