---

yaml --- r: 185537 b: refs/heads/master c: 4a72661 h: refs/heads/master i: 185535: bffd20c v: v3
git-mirror · Feb 22, 2010 · eb4dacb · eb4dacb
1 parent 7740980
commit eb4dacb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;