Gen9 WA Batch patches
Subsystems (2)
v2 cover Gen9 WA Batch patches
Compared to v1 changes are only in Patch 1, these changes are to group all infrastructure bits in a single patch. Patch 2 wasn't getting applied cleanly because of this hence sending all patches.
Arun Siluvery (4):
drm/i915: Enable WA batch buffers for Gen9 drm/i915/gen9: Add WaDisableCtxRestoreArbitration workaround drm/i915/gen9: Add WaFlushCoherentL3CacheLinesAtContextSwitch
workaround
drm/i915/gen9: Add
WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
drivers/gpu/drm/i915/intel_lrc.c | 73 +++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++- 2 files changed, 75 insertions(+), 5 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/4 drm/i915: Enable WA batch buffers for Gen9
This patch only enables support for Gen9, the actual WA will be initialized in subsequent patches.
The WARN that we use to warn user if WA batch support is not available for a particular Gen is replaced with DRM_ERROR as warning here doesn't really add much value.
v2: include all infrastructure bits in this patch so that subsequent changes only correspond the WA added (Chris)
--- drivers/gpu/drm/i915/intel_lrc.c | 50 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +47 -3
@@ -1269,6 +1269,35 @@ static int gen8_init_perctx_bb(struct intel_engine_cs *ring,return wa_ctx_end (wa_ctx, *offset = index,1 ); } +static int gen9_init_indirectctx_bb (struct intel_engine_cs *ring, +struct i915_wa_ctx_bb *wa_ctx, +uint32_t *const batch, +uint32_t *offset) +{ +uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); + +/* FIXME: Replace me with WA */ +wa_ctx_emit (batch,MI_NOOP ); + +/* Pad to end of cacheline */ +while (index %CACHELINE_DWORDS ) +wa_ctx_emit (batch,MI_NOOP ); + +return wa_ctx_end (wa_ctx, *offset = index,CACHELINE_DWORDS ); +} + +static int gen9_init_perctx_bb (struct intel_engine_cs *ring, +struct i915_wa_ctx_bb *wa_ctx, +uint32_t *const batch, +uint32_t *offset) +{ +uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); + +wa_ctx_emit (batch,MI_BATCH_BUFFER_END ); + +return wa_ctx_end (wa_ctx, *offset = index,1 ); +} +static int lrc_setup_wa_ctx_obj (struct intel_engine_cs *ring,u32 size) {int ret;
@@ -1310,10 +1339,11 @@ static int intel_init_workaround_bb(struct intel_engine_cs *ring)WARN_ON (ring->id !=RCS );/* update this when WA for higher Gen are added */ -if (WARN (INTEL_INFO (ring->dev)->gen >8 , -"WA batch buffer is not initialized for Gen%d\n" , -INTEL_INFO (ring->dev)->gen)) +if (INTEL_INFO (ring->dev)->gen >9 ) { +DRM_ERROR ("WA batch buffer is not initialized for Gen%d\n" , +INTEL_INFO (ring->dev)->gen);return 0 ; + }/* some WA perform writes to scratch page, ensure it is valid */ if (ring->scratch.obj ==NULL ) {
@@ -1345,6 +1375,20 @@ static int intel_init_workaround_bb(struct intel_engine_cs *ring) &offset);if (ret) goto out; + }else if (INTEL_INFO (ring->dev)->gen ==9 ) { + ret =gen9_init_indirectctx_bb (ring, + &wa_ctx->indirect_ctx, + batch, + &offset); +if (ret) + goto out; + + ret =gen9_init_perctx_bb (ring, + &wa_ctx->per_ctx, + batch, + &offset); +if (ret) + goto out; } out:
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/4] drm/i915: Enable WA batch buffers for Gen9
Quoted 7 lines · Arun Siluvery
This patch only enables support for Gen9, the actual WA will be initialized in subsequent patches.
The WARN that we use to warn user if WA batch support is not available for a particular Gen is replaced with
DRM_ERRORas warning here doesn't really add much value.
Quoted 5 lines
v2: include all infrastructure bits in this patch so that subsequent changes only correspond the WA added (Chris)
Cc Imre Deak <[email protected]>Signed-off-by Arun Siluvery <[email protected]>
The wa_ctx_emits need index as second param now. With those,
Quoted 87 lines
--- drivers/gpu/drm/i915/intel_lrc.c | 50 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +47
-3@@ -1269,6 +1269,35 @@ static int gen8_init_perctx_bb(struct intel_engine_cs *ring,return wa_ctx_end (wa_ctx, *offset = index,1 ); } +static int gen9_init_indirectctx_bb (struct intel_engine_cs *ring, +struct i915_wa_ctx_bb *wa_ctx, +uint32_t *const batch, +uint32_t *offset) +{ +uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); + +/* FIXME: Replace me with WA */ +wa_ctx_emit (batch,MI_NOOP ); + +/* Pad to end of cacheline */ +while (index %CACHELINE_DWORDS ) +wa_ctx_emit (batch,MI_NOOP ); + +return wa_ctx_end (wa_ctx, *offset = index,CACHELINE_DWORDS ); +} + +static int gen9_init_perctx_bb (struct intel_engine_cs *ring, +struct i915_wa_ctx_bb *wa_ctx, +uint32_t *const batch, +uint32_t *offset) +{ +uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); + +wa_ctx_emit (batch,MI_BATCH_BUFFER_END ); + +return wa_ctx_end (wa_ctx, *offset = index,1 ); +} +static int lrc_setup_wa_ctx_obj (struct intel_engine_cs *ring,u32 size) {int ret;@@ -1310,10 +1339,11 @@ static int intel_init_workaround_bb(struct intel_engine_cs *ring)WARN_ON (ring->id !=RCS );/* update this when WA for higher Gen are added */ -if (WARN (INTEL_INFO (ring->dev)->gen >8 , -"WA batch buffer is not initialized for Gen%d\n" , -INTEL_INFO (ring->dev)->gen)) +if (INTEL_INFO (ring->dev)->gen >9 ) { +DRM_ERROR ("WA batch buffer is not initialized for Gen%d\n" , +INTEL_INFO (ring->dev)->gen);return 0 ; + }/* some WA perform writes to scratch page, ensure it is valid */ if (ring->scratch.obj ==NULL ) {@@ -1345,6 +1375,20 @@ static int intel_init_workaround_bb(struct intel_engine_cs *ring) &offset);if (ret) goto out; + }else if (INTEL_INFO (ring->dev)->gen ==9 ) { + ret =gen9_init_indirectctx_bb (ring, + &wa_ctx->indirect_ctx, + batch, + &offset); +if (ret) + goto out; + + ret =gen9_init_perctx_bb (ring, + &wa_ctx->per_ctx, + batch, + &offset); +if (ret) + goto out; } out:Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/4] drm/i915: Enable WA batch buffers for Gen9
Quoted 12 lines · Mika Kuoppala
Quoted 10 lines · Arun Siluvery
This patch only enables support for Gen9, the actual WA will be initialized in subsequent patches.
The WARN that we use to warn user if WA batch support is not available for a particular Gen is replaced with
DRM_ERRORas warning here doesn't really add much value.v2: include all infrastructure bits in this patch so that subsequent changes only correspond the WA added (Chris)
Quoted 7 lines
Quoted 2 lines
Cc Imre Deak <[email protected]>Signed-off-by Arun Siluvery <[email protected]>The
wa_ctx_emitsneed index as second param now. With those,Reviewed-by Mika Kuoppala <[email protected]>
Thanks Mika, I will send the updated patches. Your r-b tag is for all patches correct? Should I include the tag while sending the patches?
regards
Arun
Quoted 79 lines
Quoted 79 lines
--- drivers/gpu/drm/i915/intel_lrc.c | 50 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +47
-3@@ -1269,6 +1269,35 @@ static int gen8_init_perctx_bb(struct intel_engine_cs *ring,return wa_ctx_end (wa_ctx, *offset = index,1 ); } +static int gen9_init_indirectctx_bb (struct intel_engine_cs *ring, +struct i915_wa_ctx_bb *wa_ctx, +uint32_t *const batch, +uint32_t *offset) +{ +uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); + +/* FIXME: Replace me with WA */ +wa_ctx_emit (batch,MI_NOOP ); + +/* Pad to end of cacheline */ +while (index %CACHELINE_DWORDS ) +wa_ctx_emit (batch,MI_NOOP ); + +return wa_ctx_end (wa_ctx, *offset = index,CACHELINE_DWORDS ); +} + +static int gen9_init_perctx_bb (struct intel_engine_cs *ring, +struct i915_wa_ctx_bb *wa_ctx, +uint32_t *const batch, +uint32_t *offset) +{ +uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); + +wa_ctx_emit (batch,MI_BATCH_BUFFER_END ); + +return wa_ctx_end (wa_ctx, *offset = index,1 ); +} +static int lrc_setup_wa_ctx_obj (struct intel_engine_cs *ring,u32 size) {int ret;@@ -1310,10 +1339,11 @@ static int intel_init_workaround_bb(struct intel_engine_cs *ring)WARN_ON (ring->id !=RCS );/* update this when WA for higher Gen are added */ -if (WARN (INTEL_INFO (ring->dev)->gen >8 , -"WA batch buffer is not initialized for Gen%d\n" , -INTEL_INFO (ring->dev)->gen)) +if (INTEL_INFO (ring->dev)->gen >9 ) { +DRM_ERROR ("WA batch buffer is not initialized for Gen%d\n" , +INTEL_INFO (ring->dev)->gen);return 0 ; + }/* some WA perform writes to scratch page, ensure it is valid */ if (ring->scratch.obj ==NULL ) {@@ -1345,6 +1375,20 @@ static int intel_init_workaround_bb(struct intel_engine_cs *ring) &offset);if (ret) goto out; + }else if (INTEL_INFO (ring->dev)->gen ==9 ) { + ret =gen9_init_indirectctx_bb (ring, + &wa_ctx->indirect_ctx, + batch, + &offset); +if (ret) + goto out; + + ret =gen9_init_perctx_bb (ring, + &wa_ctx->per_ctx, + batch, + &offset); +if (ret) + goto out; }
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_lrc.c +0
-1out: --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/4 drm/i915/gen9: Add WaDisableCtxRestoreArbitration workaround
In reply to Arun SiluveryIn Indirect and Per context w/a batch buffer,
+WaDisableCtxRestoreArbitration
--- drivers/gpu/drm/i915/intel_lrc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +11 -2
@@ -1274,10 +1274,13 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring,uint32_t *const batch, uint32_t *offset) { + struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); -/* FIXME: Replace me with WA */ -wa_ctx_emit (batch,MI_NOOP ); +/* WaDisableCtxRestoreArbitration:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==SKL_REVID_A0 ))) +wa_ctx_emit (batch,MI_ARB_ON_OFF |MI_ARB_DISABLE );/* Pad to end of cacheline */ while (index %CACHELINE_DWORDS )
@@ -1291,8 +1294,14 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,uint32_t *const batch, uint32_t *offset) { + struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaDisableCtxRestoreArbitration:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==SKL_REVID_A0 ))) +wa_ctx_emit (batch,MI_ARB_ON_OFF |MI_ARB_ENABLE ); +wa_ctx_emit (batch,MI_BATCH_BUFFER_END );return wa_ctx_end (wa_ctx, *offset = index,1 );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/4 drm/i915/gen9: Add WaDisableCtxRestoreArbitration workaround
In Indirect and Per context w/a batch buffer,
+WaDisableCtxRestoreArbitration
v2: SKL revision id was used for BXT, copy paste error found during internal review (Bob Beckett).
--- drivers/gpu/drm/i915/intel_lrc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +11 -2
@@ -1274,10 +1274,13 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring,uint32_t *const batch, uint32_t *offset) { + struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); -/* FIXME: Replace me with WA */ -wa_ctx_emit (batch,MI_NOOP ); +/* WaDisableCtxRestoreArbitration:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) +wa_ctx_emit (batch,MI_ARB_ON_OFF |MI_ARB_DISABLE );/* Pad to end of cacheline */ while (index %CACHELINE_DWORDS )
@@ -1291,8 +1294,14 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,uint32_t *const batch, uint32_t *offset) { + struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaDisableCtxRestoreArbitration:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) +wa_ctx_emit (batch,MI_ARB_ON_OFF |MI_ARB_ENABLE ); +wa_ctx_emit (batch,MI_BATCH_BUFFER_END );return wa_ctx_end (wa_ctx, *offset = index,1 );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/4] drm/i915/gen9: Add WaDisableCtxRestoreArbitration workaround
Quoted 9 lines · Arun Siluvery
In Indirect and Per context w/a batch buffer,
+WaDisableCtxRestoreArbitrationv2: SKL revision id was used for BXT, copy paste error found during internal review (Bob Beckett).
Cc Robert Beckett <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Arun Siluvery <[email protected]>
Quoted 46 lines
--- drivers/gpu/drm/i915/intel_lrc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +11
-2@@ -1274,10 +1274,13 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring,uint32_t *const batch, uint32_t *offset) { + struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); -/* FIXME: Replace me with WA */ -wa_ctx_emit (batch,MI_NOOP ); +/* WaDisableCtxRestoreArbitration:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) +wa_ctx_emit (batch,MI_ARB_ON_OFF |MI_ARB_DISABLE );/* Pad to end of cacheline */ while (index %CACHELINE_DWORDS )@@ -1291,8 +1294,14 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,uint32_t *const batch, uint32_t *offset) { + struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaDisableCtxRestoreArbitration:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) +wa_ctx_emit (batch,MI_ARB_ON_OFF |MI_ARB_ENABLE ); +wa_ctx_emit (batch,MI_BATCH_BUFFER_END );return wa_ctx_end (wa_ctx, *offset = index,1 );Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/4] drm/i915/gen9: Add WaDisableCtxRestoreArbitration workaround
Quoted 5 lines · Mika Kuoppala
Quoted 3 lines · Arun Siluvery
In Indirect and Per context w/a batch buffer,
+WaDisableCtxRestoreArbitration
Quoted 8 lines
Quoted 6 lines
v2: SKL revision id was used for BXT, copy paste error found during internal review (Bob Beckett).
Cc Robert Beckett <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Arun Siluvery <[email protected]>Reviewed-by Mika Kuoppala <[email protected]>
Merged first two patches of this series to dinq, thanks. -Daniel
Quoted 51 lines
Quoted 47 lines
--- drivers/gpu/drm/i915/intel_lrc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +11
-2@@ -1274,10 +1274,13 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring,uint32_t *const batch, uint32_t *offset) { + struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); -/* FIXME: Replace me with WA */ -wa_ctx_emit (batch,MI_NOOP ); +/* WaDisableCtxRestoreArbitration:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) +wa_ctx_emit (batch,MI_ARB_ON_OFF |MI_ARB_DISABLE );/* Pad to end of cacheline */ while (index %CACHELINE_DWORDS )@@ -1291,8 +1294,14 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,uint32_t *const batch, uint32_t *offset) { + struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaDisableCtxRestoreArbitration:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) +wa_ctx_emit (batch,MI_ARB_ON_OFF |MI_ARB_ENABLE ); +wa_ctx_emit (batch,MI_BATCH_BUFFER_END );return wa_ctx_end (wa_ctx, *offset = index,1 );Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/4] drm/i915/gen9: Add WaDisableCtxRestoreArbitration workaround
Quoted 9 lines · Daniel Vetter
Quoted 8 lines · Mika Kuoppala
Quoted 6 lines · Arun Siluvery
In Indirect and Per context w/a batch buffer,
+WaDisableCtxRestoreArbitrationv2: SKL revision id was used for BXT, copy paste error found during internal review (Bob Beckett).
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Cc Robert Beckett <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Arun Siluvery <[email protected]>Reviewed-by Mika Kuoppala <[email protected]>Merged first two patches of this series to dinq, thanks.
Actually strike that, these all need rebasing. Dropped again. -Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/4 drm/i915/gen9: Add WaFlushCoherentL3CacheLinesAtContextSwitch workaround
In reply to Arun SiluveryIn Indirect context w/a batch buffer,
+WaFlushCoherentL3CacheLinesAtContextSwitch:bdw
--- drivers/gpu/drm/i915/intel_lrc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_lrc.c +5 -0
@@ -1282,6 +1282,11 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring, (IS_BROXTON(dev) && (INTEL_REVID(dev) == SKL_REVID_A0)))wa_ctx_emit (batch,MI_ARB_ON_OFF |MI_ARB_DISABLE ); +/* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt */ + index =gen8_emit_flush_coherentl3_wa (ring, batch, index); +if (index <0 ) +return index; +/* Pad to end of cacheline */ while (index %CACHELINE_DWORDS )wa_ctx_emit (batch,MI_NOOP );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/4 drm/i915/gen9: Add WaFlushCoherentL3CacheLinesAtContextSwitch workaround
In Indirect context w/a batch buffer,
+WaFlushCoherentL3CacheLinesAtContextSwitch:bdw
v2: address static checker warning where unsigned value was checked for less than zero which is never true.
--- drivers/gpu/drm/i915/intel_lrc.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_lrc.c +7 -0
@@ -1253,6 +1253,7 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring,uint32_t *const batch, uint32_t *offset) { + int ret;struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS );
@@ -1261,6 +1262,12 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring, (IS_BROXTON(dev) && (INTEL_REVID(dev) == BXT_REVID_A0)))wa_ctx_emit (batch,MI_ARB_ON_OFF |MI_ARB_DISABLE ); +/* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt */ + ret =gen8_emit_flush_coherentl3_wa (ring, batch, index); +if (ret <0 ) +return ret; + index = ret; +/* Pad to end of cacheline */ while (index %CACHELINE_DWORDS )wa_ctx_emit (batch,MI_NOOP );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 3/4] drm/i915/gen9: Add WaFlushCoherentL3CacheLinesAtContextSwitch workaround
Quoted 2 lines · Arun Siluvery
In Indirect context w/a batch buffer,
+WaFlushCoherentL3CacheLinesAtContextSwitch:bdw
s/bdw/skl ?
Quoted 4 lines
v2: address static checker warning where unsigned value was checked for less than zero which is never true.
Add ^^ (Dan Carpenter)
Quoted 1 line
Reported-by Dan Carpenter <[email protected]>
And remove this line as this would mean the workaround/bug in question would be reported by Dan.
Quoted 19 lines
Cc Imre Deak <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_lrc.c +1
-0@@ -1253,6 +1253,7 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring,uint32_t *const batch, uint32_t *offset) { + int ret;struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS );
drivers/gpu/drm/i915/intel_lrc.c static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring, · line 1266
Quoted 5 lines
drivers/gpu/drm/i915/intel_lrc.c +2
-0@@ -1261,6 +1262,12 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *ring, (IS_BROXTON(dev) && (INTEL_REVID(dev) == BXT_REVID_A0)))wa_ctx_emit (batch,MI_ARB_ON_OFF |MI_ARB_DISABLE ); +/* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt */ + ret =gen8_emit_flush_coherentl3_wa (ring, batch, index);
Not shown in this patch but the above function assumes default value for GEN8_L3SQCREG4 which doesn't match what we have by default.
This is due to skl_init_clock_gating() setting up one bit in this register.
I think the proper way to fix this would be remove the write from skl_init_clock_gating() and setup all the bits in this register, even the default ones with WA_SET_BIT() in gen9_init_workarounds().
And then search the default value out from the wa list, when you build the batch.
But if you choose to go with default skl value of0x48400000, make a comment to intel_pm.c and also
the gen8_emit_flush_coherentl3_wa() that you
have a dependency.
-Mika
Quoted 16 lines
drivers/gpu/drm/i915/intel_lrc.c +4
-0+if (ret <0 ) +return ret; + index = ret; +/* Pad to end of cacheline */ drivers/gpu/drm/i915/intel_lrc.c +0
-0while (index %CACHELINE_DWORDS )wa_ctx_emit (batch,MI_NOOP );Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/4 drm/i915/gen9: Add WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
In reply to Arun SiluveryIn Indirect context w/a batch buffer, +WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
--- drivers/gpu/drm/i915/intel_lrc.c | 9 +++++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +9 -0
@@ -1302,6 +1302,15 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_B0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==SKL_REVID_A0 ))) { +wa_ctx_emit (batch,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch,GEN9_SLICE_COMMON_ECO_CHICKEN0 ); +wa_ctx_emit (batch,_MASKED_BIT_ENABLE (DISABLE_PIXEL_MASK_CAMMING )); +wa_ctx_emit (batch,MI_NOOP ); + } +/* WaDisableCtxRestoreArbitration:skl,bxt */ if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || (IS_BROXTON (dev) && (INTEL_REVID (dev) ==SKL_REVID_A0 )))
drivers/gpu/drm/i915/intel_ringbuffer.c +5 -2
@@ -946,8 +946,11 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE ); -WA_SET_BIT_MASKED (GEN9_SLICE_COMMON_ECO_CHICKEN0 , -DISABLE_PIXEL_MASK_CAMMING ); +/* +* WA also requires GEN9_SLICE_COMMON_ECO_CHICKEN0[14] to be set, +* but that register is write only hence it is set +* in per ctx batch buffer +*/ } if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) >= SKL_REVID_C0) ||
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/4 drm/i915/gen9: Add WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
In Indirect context w/a batch buffer, +WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
v2: SKL revision id was used for BXT, copy paste error found during internal review (Bob Beckett).
--- drivers/gpu/drm/i915/intel_lrc.c | 9 +++++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +9 -0
@@ -1302,6 +1302,15 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_B0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) { +wa_ctx_emit (batch,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch,GEN9_SLICE_COMMON_ECO_CHICKEN0 ); +wa_ctx_emit (batch,_MASKED_BIT_ENABLE (DISABLE_PIXEL_MASK_CAMMING )); +wa_ctx_emit (batch,MI_NOOP ); + } +/* WaDisableCtxRestoreArbitration:skl,bxt */ if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 )))
drivers/gpu/drm/i915/intel_ringbuffer.c +5 -2
@@ -946,8 +946,11 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE ); -WA_SET_BIT_MASKED (GEN9_SLICE_COMMON_ECO_CHICKEN0 , -DISABLE_PIXEL_MASK_CAMMING ); +/* +* WA also requires GEN9_SLICE_COMMON_ECO_CHICKEN0[14] to be set, +* but that register is write only hence it is set +* in per ctx batch buffer +*/ } if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) >= SKL_REVID_C0) ||
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 4/4] drm/i915/gen9: Add WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
Quoted 39 lines · Arun Siluvery
In Indirect context w/a batch buffer, +WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
v2: SKL revision id was used for BXT, copy paste error found during internal review (Bob Beckett).
Cc Robert Beckett <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 9 +++++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +9
-0@@ -1302,6 +1302,15 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_B0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) { +wa_ctx_emit (batch,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch,GEN9_SLICE_COMMON_ECO_CHICKEN0 ); +wa_ctx_emit (batch,_MASKED_BIT_ENABLE (DISABLE_PIXEL_MASK_CAMMING )); +wa_ctx_emit (batch,MI_NOOP ); + } +/* WaDisableCtxRestoreArbitration:skl,bxt */ if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 )))drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0
drivers/gpu/drm/i915/intel_ringbuffer.c static int gen9_init_workarounds(struct intel_engine_cs *ring) · line 952
Quoted 9 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4
-2@@ -946,8 +946,11 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE ); -WA_SET_BIT_MASKED (GEN9_SLICE_COMMON_ECO_CHICKEN0 , -DISABLE_PIXEL_MASK_CAMMING ); +/* +* WA also requires GEN9_SLICE_COMMON_ECO_CHICKEN0[14] to be set, +* but that register is write only hence it is set +* in per ctx batch buffer
Why the need to move to per ctx bb? Why the write would not stick with this? Is the rationale that we get fails with the gem_workarounds?
If so, perhaps we need a write_only marker for workaround list?
-Mika
Quoted 11 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +1
-0+*/ } if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) >= SKL_REVID_C0) ||Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 4/4] drm/i915/gen9: Add WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
Quoted 54 lines · Mika Kuoppala
Quoted 39 lines · Arun Siluvery
In Indirect context w/a batch buffer, +WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
v2: SKL revision id was used for BXT, copy paste error found during internal review (Bob Beckett).
Cc Robert Beckett <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 9 +++++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +9
-0@@ -1302,6 +1302,15 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_B0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) { +wa_ctx_emit (batch,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch,GEN9_SLICE_COMMON_ECO_CHICKEN0 ); +wa_ctx_emit (batch,_MASKED_BIT_ENABLE (DISABLE_PIXEL_MASK_CAMMING )); +wa_ctx_emit (batch,MI_NOOP ); + } +/* WaDisableCtxRestoreArbitration:skl,bxt */ if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 )))drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0drivers/gpu/drm/i915/intel_ringbuffer.c static int gen9_init_workarounds(struct intel_engine_cs *ring) · line 952
Quoted 9 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4
-2@@ -946,8 +946,11 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE ); -WA_SET_BIT_MASKED (GEN9_SLICE_COMMON_ECO_CHICKEN0 , -DISABLE_PIXEL_MASK_CAMMING ); +/* +* WA also requires GEN9_SLICE_COMMON_ECO_CHICKEN0[14] to be set, +* but that register is write only hence it is set +* in per ctx batch buffer Why the need to move to per ctx bb? Why the write would not stick with this? Is the rationale that we get fails with the
gem_workarounds?
Quoted 3 lines
If so, perhaps we need a
write_onlymarker for workaround list?-Mika
Surely it's the fact that it's a context-saved register that matters, rather than it being write-only (generally we treat masked registers as write-only anyway, since the masking means that you can set or clear a bit without having to read the other bits first).
Whereas AFAICS GEN7_COMMON_SLICE_CHICKEN1 is a global non-context register, so it can be set directly rather than having to be done in a batchbuffer.
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 4/4] drm/i915/gen9: Add WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
Hi Dave,
Quoted 55 lines · Dave Gordon
Quoted 54 lines · Mika Kuoppala
Quoted 39 lines · Arun Siluvery
In Indirect context w/a batch buffer, +WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
v2: SKL revision id was used for BXT, copy paste error found during internal review (Bob Beckett).
Cc Robert Beckett <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 9 +++++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +9
-0@@ -1302,6 +1302,15 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ +if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_B0 )) || + (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) { +wa_ctx_emit (batch,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch,GEN9_SLICE_COMMON_ECO_CHICKEN0 ); +wa_ctx_emit (batch,_MASKED_BIT_ENABLE (DISABLE_PIXEL_MASK_CAMMING )); +wa_ctx_emit (batch,MI_NOOP ); + } +/* WaDisableCtxRestoreArbitration:skl,bxt */ if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_D0 )) || (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 )))drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0drivers/gpu/drm/i915/intel_ringbuffer.c static int gen9_init_workarounds(struct intel_engine_cs *ring) · line 952
Quoted 9 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4
-2@@ -946,8 +946,11 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ WA_SET_BIT_MASKED (GEN7_COMMON_SLICE_CHICKEN1 ,GEN9_RHWO_OPTIMIZATION_DISABLE ); -WA_SET_BIT_MASKED (GEN9_SLICE_COMMON_ECO_CHICKEN0 , -DISABLE_PIXEL_MASK_CAMMING ); +/* +* WA also requires GEN9_SLICE_COMMON_ECO_CHICKEN0[14] to be set, +* but that register is write only hence it is set +* in per ctx batch buffer Why the need to move to per ctx bb? Why the write would not stick with this? Is the rationale that we get fails with the
gem_workarounds?
Quoted 9 lines
Quoted 3 lines
If so, perhaps we need a
write_onlymarker for workaround list?-Mika
Surely it's the fact that it's a context-saved register that matters, rather than it being write-only (generally we treat masked registers as write-only anyway, since the masking means that you can set or clear a bit without having to read the other bits first).
But with workaround list, we push these writes into the ringbuffer of the context being created. So I still fail to see how they would end up being out of context.
The per ctx bb would make sense if this register was not part of contexts and thus would not be saved. Is this the case here?
-Mika
Quoted 5 lines
Whereas AFAICS
GEN7_COMMON_SLICE_CHICKEN1is a global non-context register, so it can be set directly rather than having to be done in a batchbuffer..Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx