From 41d901a2dfdac6e822731d70e15e8d3e909efd66 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 14 Dec 2011 13:57:23 +0100
Subject: [PATCH] --- yaml --- r: 293836 b: refs/heads/master c:
 c501ae7f332cdaf42e31af30b72b4b66cbbb1604 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c97d2d954182..c4fb7ec85e03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3dfefa0a6d235bd465309e12f4c56ea16e71111
+refs/heads/master: c501ae7f332cdaf42e31af30b72b4b66cbbb1604
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 6dbcec387951..1f441f5c2405 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3064,10 +3064,13 @@ i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj)
 			return ret;
 	}
 
+	ret = i915_gem_object_wait_rendering(obj);
+	if (ret)
+		return ret;
+
 	/* Ensure that we invalidate the GPU's caches and TLBs. */
 	obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS;
-
-	return i915_gem_object_wait_rendering(obj);
+	return 0;
 }
 
 /**