---

yaml --- r: 307203 b: refs/heads/master c: 31b14c9 h: refs/heads/master i: 307201: bbbecb1 307199: 34b6bcc v: v3
git-mirror · Apr 20, 2012 · 3cce8d5 · 3cce8d5
1 parent 0791d82
commit 3cce8d5
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: 284d5df5716aad3c729d1ac4a2a93b8d0ac33ecc
+refs/heads/master: 31b14c9fc596a68a2a982d7e3c136922f81a2e25
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -61,7 +61,7 @@ gen2_render_ring_flush(struct intel_ring_buffer *ring,
 	int ret;
 
 	cmd = MI_FLUSH;
-	if ((flush_domains & I915_GEM_DOMAIN_RENDER) == 0)
+	if (((invalidate_domains|flush_domains) & I915_GEM_DOMAIN_RENDER) == 0)
 		cmd |= MI_NO_WRITE_FLUSH;
 
 	if (invalidate_domains & I915_GEM_DOMAIN_SAMPLER)