---

yaml --- r: 345274 b: refs/heads/master c: 3ac7831 h: refs/heads/master v: v3
git-mirror · Nov 11, 2012 · a0aa525 · a0aa525
1 parent c9547a9
commit a0aa525
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: 9a28977181724ebbd9bdc45291cf29da55a729ee
+refs/heads/master: 3ac7831314eba873d60b58718123c503f6961337
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -245,7 +245,7 @@ gen6_render_ring_flush(struct intel_ring_buffer *ring,
 		/*
 		 * TLB invalidate requires a post-sync write.
 		 */
-		flags |= PIPE_CONTROL_QW_WRITE;
+		flags |= PIPE_CONTROL_QW_WRITE | PIPE_CONTROL_CS_STALL;
 	}
 
 	ret = intel_ring_begin(ring, 4);