---

yaml --- r: 218341 b: refs/heads/master c: 878a3c3 h: refs/heads/master i: 218339: 8e41a79 v: v3
git-mirror · Oct 22, 2010 · 3267e3f · 3267e3f
1 parent eb2023d
commit 3267e3f
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: e27d8538695d1aee69eb4fdd6f98988e6ffc5c33
+refs/heads/master: 878a3c37d36142a192bdf5b6bfcf920832f431d7
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3349,7 +3349,7 @@ i915_gem_execbuffer_relocate(struct drm_i915_gem_object *obj,
 		}
 
 		target_obj->pending_read_domains |= reloc.read_domains;
-		target_obj->pending_write_domain = reloc.write_domain;
+		target_obj->pending_write_domain |= reloc.write_domain;
 
 		/* If the relocation already has the right value in it, no
 		 * more work needs to be done.