On Mon, Jan 27, 2014 at 04:46:59PM -0800, Ben Widawsky wrote:
> On Mon, Jan 27, 2014 at 02:20:14PM -0800, Kenneth Graunke wrote:
> > According to the latest documentation, any PIPE_CONTROL with the
> > "Command Streamer Stall" bit set must also have another bit set,
> > with five different options.  I chose "Stall at Pixel Scoreboard"
> > since we've used it effectively in the past, but the choice is
> > fairly arbitrary.
> > 
> > Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
> > ---
> >  drivers/gpu/drm/i915/intel_ringbuffer.c | 9 ++++++++-
> >  1 file changed, 8 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c 
> > b/drivers/gpu/drm/i915/intel_ringbuffer.c
> > index e75d8b3..313b1bd 100644
> > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> > @@ -370,7 +370,14 @@ gen8_render_ring_flush(struct intel_ring_buffer *ring,
> >     u32 scratch_addr = ring->scratch.gtt_offset + 128;
> >     int ret;
> >  
> > -   flags |= PIPE_CONTROL_CS_STALL;
> > +   /* For CS stalls, one of the following must also be set:
> > +    * - Render Target Cache Flush
> > +    * - Depth Cache Flush
> > +    * - Stall at Pixel Scoreboard
> > +    * - Post-Sync Operation
> > +    * We arbitrarily choose "Stall at Scoreboard".
> > +    */
> > +   flags |= PIPE_CONTROL_CS_STALL | PIPE_CONTROL_STALL_AT_SCOREBOARD;
> >  
> >     if (flush_domains) {
> >             flags |= PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH;
> 
> If I am reading the same workaround as you, we only need to do this when
> !flush_domains, since we satisfy the requisite in the flush_domains
> case.

And we satisfy them for !flush_domains as well since we do a post-sync
operation (since it must be an invalidate_domains).
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to