This is a note to let you know that I've just added the patch titled
drm/radeon: fix S/R on VM systems (cayman/TN/SI)
to the 3.8-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-s-r-on-vm-systems-cayman-tn-si.patch
and it can be found in the queue-3.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From fa3daf9aa74a3ac1c87d8188a43d283d06720032 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Mon, 11 Mar 2013 15:32:26 -0400
Subject: drm/radeon: fix S/R on VM systems (cayman/TN/SI)
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit fa3daf9aa74a3ac1c87d8188a43d283d06720032 upstream.
We weren't properly tearing down the VM sub-alloctor
on suspend leading to bogus VM PTs on resume.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=60439
Reviewed-by: Christian König <christian.koenig@xxxxxxx>
Tested-by: Dmitry Cherkasov <Dmitrii.Cherkasov@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/ni.c | 1 +
drivers/gpu/drm/radeon/si.c | 1 +
2 files changed, 2 insertions(+)
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1671,6 +1671,7 @@ int cayman_resume(struct radeon_device *
int cayman_suspend(struct radeon_device *rdev)
{
r600_audio_fini(rdev);
+ radeon_vm_manager_fini(rdev);
cayman_cp_enable(rdev, false);
cayman_dma_stop(rdev);
evergreen_irq_suspend(rdev);
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -4232,6 +4232,7 @@ int si_resume(struct radeon_device *rdev
int si_suspend(struct radeon_device *rdev)
{
+ radeon_vm_manager_fini(rdev);
si_cp_enable(rdev, false);
cayman_dma_stop(rdev);
si_irq_suspend(rdev);
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-3.8/drm-radeon-add-support-for-richland-apus.patch
queue-3.8/drm-radeon-benchmark-make-sure-bo-blit-copy-exists-before-using-it.patch
queue-3.8/drm-radeon-fix-backend-map-setup-on-1-rb-trinity-boards.patch
queue-3.8/drm-radeon-add-richland-pci-ids.patch
queue-3.8/drm-radeon-fix-s-r-on-vm-systems-cayman-tn-si.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