From 282dfa38633fce896a32cff77a6fb47b4574d29d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Fri, 18 Sep 2009 18:41:24 +1000
Subject: [PATCH] --- yaml --- r: 164032 b: refs/heads/master c:
 4153e584ee02ee59388a89879795fd3653a6b6da h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/gpu/drm/radeon/rv770.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4d1ef1cc3c61..f3a5234942e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9052aa2458fc13788e468a010fa0ed9aa4020380
+refs/heads/master: 4153e584ee02ee59388a89879795fd3653a6b6da
diff --git a/trunk/drivers/gpu/drm/radeon/rv770.c b/trunk/drivers/gpu/drm/radeon/rv770.c
index 576ae2f6c717..83723f8b94b0 100644
--- a/trunk/drivers/gpu/drm/radeon/rv770.c
+++ b/trunk/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;
 }