Gen9 WA Batch patches
Subsystems (2)
v3 cover Gen9 WA Batch patches
First two patches received r-b tags.
All patches use updated macro, patch 3 and 4 updated as per review comments.
v2 review history is available at,
http://www.spinics.net/lists/intel-gfx/msg70952.html
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 | 85 +++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_pm.c | 3 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++- 3 files changed, 90 insertions(+), 5 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 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)
v3: use updated macro.
--- drivers/gpu/drm/i915/intel_lrc.c | 50 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +47 -3
@@ -1248,6 +1248,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, index,MI_NOOP ); + +/* Pad to end of cacheline */ +while (index %CACHELINE_DWORDS ) +wa_ctx_emit (batch, index,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, index,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;
@@ -1289,10 +1318,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 ) {
@@ -1324,6 +1354,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
PATCH v3 2/4 drm/i915/gen9: Add WaDisableCtxRestoreArbitration workaround
In reply to Arun SiluveryIn 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).
v3: use updated macro.
--- drivers/gpu/drm/i915/intel_lrc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +11 -2
@@ -1253,10 +1253,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, index,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, index,MI_ARB_ON_OFF |MI_ARB_DISABLE );/* Pad to end of cacheline */ while (index %CACHELINE_DWORDS )
@@ -1270,8 +1273,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, index,MI_ARB_ON_OFF |MI_ARB_ENABLE ); +wa_ctx_emit (batch, index,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 v3 3/4 drm/i915/gen9: Add WaFlushCoherentL3CacheLinesAtContextSwitch workaround
In reply to Arun SiluveryIn Indirect context w/a batch buffer, +WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt
v2: address static checker warning where unsigned value was checked for less than zero which is never true (Dan Carpenter).
v3: The WA uses default value of GEN8_L3SQCREG4 during flush but that disables some other WA; update default value to retain it and document dependency (Mika).
--- drivers/gpu/drm/i915/intel_lrc.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_pm.c | 3 +++ 2 files changed, 19 insertions(+)
drivers/gpu/drm/i915/intel_lrc.c +16 -0
@@ -1097,6 +1097,15 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring, {uint32_t l3sqc4_flush = (0x40400000 |GEN8_LQSC_FLUSH_COHERENT_LINES ); +/* +* WaDisableLSQCROPERFforOCL:skl +* This WA is implemented in skl_init_clock_gating() but since +* this batch updates GEN8_L3SQCREG4 with default value we need to +* set this bit here to retain the WA during flush. +*/ +if (IS_SKYLAKE (ring->dev) &&INTEL_REVID (ring->dev) <=SKL_REVID_E0 ) + l3sqc4_flush |=GEN8_LQSC_RO_PERF_DIS ; +wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 (1 ) |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );
@@ -1253,6 +1262,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 +1271,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, index,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, index,MI_NOOP );
drivers/gpu/drm/i915/intel_pm.c +3 -0
@@ -91,6 +91,9 @@ static void skl_init_clock_gating(struct drm_device *dev) _MASKED_BIT_ENABLE(GEN9_TSG_BARRIER_ACK_DISABLE)); } +/* GEN8_L3SQCREG4 has a dependency with WA batch so any new changes +* involving this register should also be added to WA batch as required. +*/ if (INTEL_REVID (dev) <=SKL_REVID_E0 )/* WaDisableLSQCROPERFforOCL:skl */ I915_WRITE(GEN8_L3SQCREG4, I915_READ(GEN8_L3SQCREG4) |
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/4 drm/i915/gen9: Add WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
In reply to Arun SiluveryIn Indirect context w/a batch buffer, +WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
v2: SKL revision id was used for BXT, copy paste error found during internal review (Bob Beckett).
v3: explain why part of the WA is in Per ctx batch (Mika)
--- drivers/gpu/drm/i915/intel_lrc.c | 10 ++++++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +10 -0
@@ -1292,6 +1292,16 @@ 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, index,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch, index,GEN9_SLICE_COMMON_ECO_CHICKEN0 ); +wa_ctx_emit (batch, index, +_MASKED_BIT_ENABLE (DISABLE_PIXEL_MASK_CAMMING )); +wa_ctx_emit (batch, index,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:14] to be set +* but we do that in per ctx batchbuffer as there is an issue +* with this register not getting restored on ctx restore +*/ } 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 v3 4/4] drm/i915/gen9: Add WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
Quoted 11 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).
v3: explain why part of the WA is in Per ctx batch (Mika)
Cc Mika Kuoppala <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Arun Siluvery <[email protected]>
Patches 3/4 and 4/4,
Quoted 51 lines
--- drivers/gpu/drm/i915/intel_lrc.c | 10 ++++++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +10
-0@@ -1292,6 +1292,16 @@ 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, index,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch, index,GEN9_SLICE_COMMON_ECO_CHICKEN0 ); +wa_ctx_emit (batch, index, +_MASKED_BIT_ENABLE (DISABLE_PIXEL_MASK_CAMMING )); +wa_ctx_emit (batch, index,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:14] to be set +* but we do that in per ctx batchbuffer as there is an issue +* with this register not getting restored on ctx restore +*/ } 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 v3 4/4] drm/i915/gen9: Add WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
Quoted 10 lines · Mika Kuoppala
Quoted 8 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).
v3: explain why part of the WA is in Per ctx batch (Mika)
Quoted 7 lines
Quoted 3 lines
Cc Mika Kuoppala <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Arun Siluvery <[email protected]>Patches 3/4 and 4/4,
Reviewed-by Mika Kuoppala <[email protected]>
Entire series merged, thanks.
-Daniel
Quoted 56 lines
Quoted 52 lines
--- drivers/gpu/drm/i915/intel_lrc.c | 10 ++++++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +10
-0@@ -1292,6 +1292,16 @@ 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, index,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch, index,GEN9_SLICE_COMMON_ECO_CHICKEN0 ); +wa_ctx_emit (batch, index, +_MASKED_BIT_ENABLE (DISABLE_PIXEL_MASK_CAMMING )); +wa_ctx_emit (batch, index,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:14] to be set +* but we do that in per ctx batchbuffer as there is an issue +* with this register not getting restored on ctx restore +*/ } 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
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