---

yaml --- r: 307132 b: refs/heads/master c: f841319 h: refs/heads/master v: v3
git-mirror · Apr 12, 2012 · 3c5e935 · 3c5e935
1 parent 72c5f77
commit 3c5e935
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 211c568bc6a1ebd51e35724f6d733e76717ce368
+refs/heads/master: f84131905b9b3b02b1c5061c0720e503c8d22778
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3068,9 +3068,11 @@ i915_gem_object_set_to_cpu_domain(struct drm_i915_gem_object *obj, bool write)
 	if (ret)
 		return ret;
 
-	ret = i915_gem_object_wait_rendering(obj);
-	if (ret)
-		return ret;
+	if (write || obj->pending_gpu_write) {
+		ret = i915_gem_object_wait_rendering(obj);
+		if (ret)
+			return ret;
+	}
 
 	i915_gem_object_flush_gtt_write_domain(obj);