From 3cce8d5a975826a43cb3d33f016d43dc79bf3ade Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 19 Apr 2012 16:45:22 +0200 Subject: [PATCH] --- yaml --- r: 307203 b: refs/heads/master c: 31b14c9fc596a68a2a982d7e3c136922f81a2e25 h: refs/heads/master i: 307201: bbbecb17a9c1b21264e5f26d49aa6710c97d7fd8 307199: 34b6bccf204df912c58382bf4947d07ae895238c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cc591cd3642c..6fec70a13cdc 100644 --- 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 index 6f610f28b1be..12d9bc789dfb 100644 --- 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)