drm/i915/bdw: cs-stall before state cache invld w/a
Subsystems (2)
PATCH 1/1 drm/i915/bdw: cs-stall before state cache invld w/a
We do this already for previous GENs. I guess we must do it for BDW too according to DOCS.
"Pipe_control with CS-stall bit set must be issued before a pipe-control command that has the State Cache Invalidate bit set."
This does not solve the problem I have unfortunately.
I didn't check if this was in Ville's CHV series. If it was, I apologize.
NOTE: I tried to use smaller lengths for the command, but nothing made it happy except 6.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +16 -3
@@ -266,17 +266,25 @@ gen6_render_ring_flush(struct intel_ring_buffer *ring,static int gen7_render_ring_cs_stall_wa (struct intel_ring_buffer *ring) { -int ret; +int ret, size =4 ; - ret =intel_ring_begin (ring,4 ); +if (IS_BROADWELL (ring->dev)) + size +=2 ; + + ret =intel_ring_begin (ring, size);if (ret)return ret; -intel_ring_emit (ring,GFX_OP_PIPE_CONTROL (4 )); +intel_ring_emit (ring,GFX_OP_PIPE_CONTROL (size));intel_ring_emit (ring,PIPE_CONTROL_CS_STALL |PIPE_CONTROL_STALL_AT_SCOREBOARD );intel_ring_emit (ring,0 );intel_ring_emit (ring,0 ); +if (IS_BROADWELL (ring->dev)) { +intel_ring_emit (ring,0 ); +intel_ring_emit (ring,0 ); + } +intel_ring_advance (ring);return 0 ;
@@ -389,6 +397,11 @@ gen8_render_ring_flush(struct intel_ring_buffer *ring, flags |=PIPE_CONTROL_STATE_CACHE_INVALIDATE ; flags |=PIPE_CONTROL_QW_WRITE ; flags |=PIPE_CONTROL_GLOBAL_GTT_IVB ; + +/* Workaround: we must issue a pipe_control with CS-stall bit +* set before a pipe_control command that has the state cache +* invalidate bit set. */ +gen7_render_ring_cs_stall_wa (ring); } ret =intel_ring_begin (ring,6 );
Signature · 1 line
1.9.1
Quoted 10 lines · Ben Widawsky
We do this already for previous GENs. I guess we must do it for BDW too according to DOCS.
"
Pipe_controlwith CS-stall bit set must be issued before a pipe-control command that has the State Cache Invalidate bit set."This does not solve the problem I have unfortunately.
I didn't check if this was in Ville's CHV series. If it was, I apologize.
No, but it was posted by Ken some time ago already. I picked up Ken's patches and was going to repost them as part of my next workarounds series.
Quoted 63 lines
NOTE: I tried to use smaller lengths for the command, but nothing made it happy except 6.
Cc Kenneth Graunke <[email protected]>Cc Jordan Justen <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_ringbuffer.c +16
-3@@ -266,17 +266,25 @@ gen6_render_ring_flush(struct intel_ring_buffer *ring,static int gen7_render_ring_cs_stall_wa (struct intel_ring_buffer *ring) { -int ret; +int ret, size =4 ; - ret =intel_ring_begin (ring,4 ); +if (IS_BROADWELL (ring->dev)) + size +=2 ; + + ret =intel_ring_begin (ring, size);if (ret)return ret; -intel_ring_emit (ring,GFX_OP_PIPE_CONTROL (4 )); +intel_ring_emit (ring,GFX_OP_PIPE_CONTROL (size));intel_ring_emit (ring,PIPE_CONTROL_CS_STALL |PIPE_CONTROL_STALL_AT_SCOREBOARD );intel_ring_emit (ring,0 );intel_ring_emit (ring,0 ); +if (IS_BROADWELL (ring->dev)) { +intel_ring_emit (ring,0 ); +intel_ring_emit (ring,0 ); + } +intel_ring_advance (ring);return 0 ;@@ -389,6 +397,11 @@ gen8_render_ring_flush(struct intel_ring_buffer *ring, flags |=PIPE_CONTROL_STATE_CACHE_INVALIDATE ; flags |=PIPE_CONTROL_QW_WRITE ; flags |=PIPE_CONTROL_GLOBAL_GTT_IVB ; + +/* Workaround: we must issue a pipe_control with CS-stall bit +* set before a pipe_control command that has the state cache +* invalidate bit set. */ +gen7_render_ring_cs_stall_wa (ring); } ret =intel_ring_begin (ring,6 );Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä Intel OTC