]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/radeon: fix S/R on VM systems (cayman/TN/SI)
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 11 Mar 2013 19:32:26 +0000 (15:32 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Mar 2013 19:17:49 +0000 (12:17 -0700)
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@amd.com>
Tested-by: Dmitry Cherkasov <Dmitrii.Cherkasov@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/radeon/ni.c
drivers/gpu/drm/radeon/si.c

index f1c25b23ce64fa7d31b326780cb5db3fa727a4c0..c2e13d248cb44e919885f3cbab19af4116f5f3c9 100644 (file)
@@ -1671,6 +1671,7 @@ int cayman_resume(struct radeon_device *rdev)
 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);
index ae8b48205a6c10257de328c0b669628436e8b0a0..dd007214dfffdd8edc178e25e2445e5fcc18c3e2 100644 (file)
@@ -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);