This is a note to let you know that I've just added the patch titled
drm/radeon: restore modeset late in GPU reset path
to the 3.7-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-restore-modeset-late-in-gpu-reset-path.patch
and it can be found in the queue-3.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From d3493574e267c203836bfdcb9c58d8af46fc0da1 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <[email protected]>
Date: Fri, 14 Dec 2012 16:20:46 -0500
Subject: drm/radeon: restore modeset late in GPU reset path
From: Jerome Glisse <[email protected]>
commit d3493574e267c203836bfdcb9c58d8af46fc0da1 upstream.
Modeset path seems to conflict sometimes with the memory management
leading to kernel deadlock. This move modesetting reset after GPU
acceleration reset.
Signed-off-by: Jerome Glisse <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/radeon/radeon_device.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1337,7 +1337,6 @@ retry:
}
radeon_restore_bios_scratch_regs(rdev);
- drm_helper_resume_force_mode(rdev->ddev);
if (!r) {
for (i = 0; i < RADEON_NUM_RINGS; ++i) {
@@ -1362,6 +1361,8 @@ retry:
}
}
+ drm_helper_resume_force_mode(rdev->ddev);
+
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 [email protected] are
queue-3.7/drm-radeon-avoid-deadlock-in-pm-path-when-waiting-for-fence.patch
queue-3.7/drm-radeon-restore-modeset-late-in-gpu-reset-path.patch
queue-3.7/drm-radeon-fix-amd-afusion-gpu-setup-aka-sumo-v2.patch
queue-3.7/drm-radeon-add-wait_until-to-evergreen-vm-safe-reg-list.patch
queue-3.7/drm-radeon-fix-edp-clk-and-lane-setup-for-scaled-modes.patch
queue-3.7/drm-radeon-don-t-leave-fence-blocked-process-on-failed-gpu-reset.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
