aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2009-09-18 18:41:24 +1000
committerDave Airlie <airlied@linux.ie>2009-09-18 18:41:24 +1000
commit4153e584ee02ee59388a89879795fd3653a6b6da (patch)
treeaf5902eb0af64fb27b2325c168093523a1d5f080 /drivers
parent9052aa2458fc13788e468a010fa0ed9aa4020380 (diff)
downloadlinaro-lsk-4153e584ee02ee59388a89879795fd3653a6b6da.tar.gz
drm/radeon/kms: more alignment for rv770.c with r600.c
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/rv770.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 576ae2f6c71..83723f8b94b 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -29,6 +29,7 @@
#include <linux/platform_device.h>
#include "drmP.h"
#include "radeon.h"
+#include "radeon_drm.h"
#include "rv770d.h"
#include "avivod.h"
#include "atom.h"
@@ -921,7 +922,11 @@ int rv770_suspend(struct radeon_device *rdev)
{
/* FIXME: we should wait for ring to be empty */
r700_cp_stop(rdev);
+ rdev->cp.ready = false;
rv770_pcie_gart_disable(rdev);
+
+ /* unpin shaders bo */
+ radeon_object_unpin(rdev->r600_blit.shader_obj);
return 0;
}