aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rv770.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/rv770.c')
-rw-r--r--drivers/gpu/drm/radeon/rv770.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 867d04bc4d39..af20a8d48dca 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -884,9 +884,8 @@ static int rv770_startup(struct radeon_device *rdev)
884 r = r600_cp_resume(rdev); 884 r = r600_cp_resume(rdev);
885 if (r) 885 if (r)
886 return r; 886 return r;
887 r = r600_wb_init(rdev); 887 /* write back buffer are not vital so don't worry about failure */
888 if (r) 888 r600_wb_enable(rdev);
889 return r;
890 return 0; 889 return 0;
891} 890}
892 891
@@ -929,8 +928,8 @@ int rv770_suspend(struct radeon_device *rdev)
929 /* FIXME: we should wait for ring to be empty */ 928 /* FIXME: we should wait for ring to be empty */
930 r700_cp_stop(rdev); 929 r700_cp_stop(rdev);
931 rdev->cp.ready = false; 930 rdev->cp.ready = false;
931 r600_wb_disable(rdev);
932 rv770_pcie_gart_disable(rdev); 932 rv770_pcie_gart_disable(rdev);
933
934 /* unpin shaders bo */ 933 /* unpin shaders bo */
935 radeon_object_unpin(rdev->r600_blit.shader_obj); 934 radeon_object_unpin(rdev->r600_blit.shader_obj);
936 return 0; 935 return 0;
@@ -1048,6 +1047,7 @@ void rv770_fini(struct radeon_device *rdev)
1048 1047
1049 r600_blit_fini(rdev); 1048 r600_blit_fini(rdev);
1050 radeon_ring_fini(rdev); 1049 radeon_ring_fini(rdev);
1050 r600_wb_fini(rdev);
1051 rv770_pcie_gart_fini(rdev); 1051 rv770_pcie_gart_fini(rdev);
1052 radeon_gem_fini(rdev); 1052 radeon_gem_fini(rdev);
1053 radeon_fence_driver_fini(rdev); 1053 radeon_fence_driver_fini(rdev);