From eb4dacb5cb4fa6307f3d569382e102c809b806fb Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 1 Feb 2010 13:59:16 +0100
Subject: [PATCH] --- yaml --- r: 185537 b: refs/heads/master c:
 4a7266123fce399f695b62b7f87b467b317f1487 h: refs/heads/master i:   185535:
 bffd20c1b5aaf46cb22ac9fc46b7710bd4a17ad3 v: v3

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

diff --git a/[refs] b/[refs]
index fc4af6d3434a..22e95f3b3e19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af86d4b0f064413d2f353a41cdc23b7dbff0823d
+refs/heads/master: 4a7266123fce399f695b62b7f87b467b317f1487
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 4a141993a37a..a236bfb30844 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2552,12 +2552,12 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj)
 		int ret;
 
 		i915_gem_object_flush_gpu_write_domain(obj);
-		i915_gem_object_flush_gtt_write_domain(obj);
 		ret = i915_gem_object_wait_rendering(obj);
 		if (ret != 0)
 			return ret;
 	}
 
+	i915_gem_object_flush_gtt_write_domain(obj);
 	i915_gem_clear_fence_reg (obj);
 
 	return 0;