drm/i915/chv: Add few more CHV workarounds
Subsystems (2)
PATCH 1/2 drm/i915/chv: Add few more CHV workarounds
WaDisableInstructionShootdown:chv WaForceEnableNonCoherent:chv WaHdcDisableFetchWhenMasked:chv WaDisableFenceDestinationToSLM:chv (pre-production)
s/WaDisableDopClockGating/WaDisableRowChickenDopClockGating, because another CHV WA is defined with the same name in intel_pm.c for a different reg.
For: VIZ-4090
--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -5024,6 +5024,7 @@ enum punit_power_well {/* GEN8 chicken */ #define HDC_CHICKEN0 0x7300#define HDC_FORCE_NON_COHERENT (1<<4) +#define HDC_DONOT_FETCH_MEM_WHEN_MASKED (1<<11)#define HDC_FENCE_DEST_SLM_DISABLE (1<<14)/* WaCatErrorRejectionIssue */
@@ -5941,6 +5942,7 @@ enum punit_power_well {#define GEN9_DG_MIRROR_FIX_ENABLE (1<<5)#define GEN8_ROW_CHICKEN 0xe4f0 +#define INSTRUCTION_SHOOTDOWN_DISABLE (1<<9)#define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)#define STALL_DOP_GATING_DISABLE (1<<5)
drivers/gpu/drm/i915/intel_ringbuffer.c +18 -2
@@ -788,14 +788,30 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)struct drm_i915_private *dev_priv = dev->dev_private;/* WaDisablePartialInstShootdown:chv */ +/* WaDisableInstructionShootdown:chv */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN , -PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE ); +PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | + (dev->pdev->revision <0x06 ? +INSTRUCTION_SHOOTDOWN_DISABLE :0 ));/* WaDisableThreadStallDopClockGating:chv */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN ,STALL_DOP_GATING_DISABLE ); -/* WaDisableDopClockGating:chv (pre-production hw) */ +/* Use Force Non-Coherent whenever executing a 3D context. This is a +* workaround for a possible hang in the unlikely event a TLB +* invalidation occurs during a PSD flush. +*/ +/* WaForceEnableNonCoherent:chv */ +/* WaHdcDisableFetchWhenMasked:chv */ +/* WaDisableFenceDestinationToSLM:chv (pre-production) */ +WA_SET_BIT_MASKED (HDC_CHICKEN0 , +HDC_FORCE_NON_COHERENT | +HDC_DONOT_FETCH_MEM_WHEN_MASKED | + (dev->pdev->revision <0x06 ? +HDC_FENCE_DEST_SLM_DISABLE :0 )); + +/* WaDisableRowChickenDopClockGating:chv (pre-production hw) */ WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 ,DOP_CLOCK_GATING_DISABLE );
Signature · 6 lines
2.1.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/gen8: Apply pre-production WA based on revision
Some of the workarounds are not required to be applied in later revisions so restrict them based on revision.
For: VIZ-4090
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2107,6 +2107,8 @@ struct drm_i915_cmd_table { ((INTEL_DEVID(dev) & 0xf) == 0x2 || \ (INTEL_DEVID(dev) & 0xf) == 0x6 || \ (INTEL_DEVID(dev) & 0xf) == 0xe)) +#define IS_BDW_GT2 (dev) (IS_BROADWELL(dev) && \ + (INTEL_DEVID(dev) & 0x00F0) == 0x0010)#define IS_BDW_GT3 (dev) (IS_BROADWELL(dev) && \ (INTEL_DEVID(dev) & 0x00F0) == 0x0020)#define IS_HSW_ULT (dev) (IS_HASWELL(dev) && \
drivers/gpu/drm/i915/intel_ringbuffer.c +12 -8
@@ -746,7 +746,8 @@ static int bdw_init_workarounds(struct intel_engine_cs *ring)/* WaDisableThreadStallDopClockGating:bdw (pre-production) */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN ,PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | -STALL_DOP_GATING_DISABLE ); + (IS_BDW_GT2 (dev) && dev->pdev->revision <0x06 ) ? +STALL_DOP_GATING_DISABLE :0 );/* WaDisableDopClockGating:bdw */ WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
@@ -756,13 +757,16 @@ static int bdw_init_workarounds(struct intel_engine_cs *ring) GEN8_SAMPLER_POWER_BYPASS_DIS);/* Use Force Non-Coherent whenever executing a 3D context. This is a -* workaround for for a possible hang in the unlikely event a TLB +* workaround for a possible hang in the unlikely event a TLB * invalidation occurs during a PSD flush. */ /* WaDisableFenceDestinationToSLM:bdw (GT3 pre-production) */ WA_SET_BIT_MASKED (HDC_CHICKEN0 ,HDC_FORCE_NON_COHERENT | - (IS_BDW_GT3 (dev) ?HDC_FENCE_DEST_SLM_DISABLE :0 )); + ((IS_BDW_GT3 (dev) && + (dev->pdev->revision ==0x08 || + dev->pdev->revision ==0x09 )) + ?HDC_FENCE_DEST_SLM_DISABLE :0 ));/* Wa4x4STCOptimizationDisable:bdw */ WA_SET_BIT_MASKED(CACHE_MODE_1,
@@ -812,12 +816,12 @@ static int chv_init_workarounds(struct intel_engine_cs *ring) HDC_FENCE_DEST_SLM_DISABLE : 0));/* WaDisableRowChickenDopClockGating:chv (pre-production hw) */ -WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 , -DOP_CLOCK_GATING_DISABLE ); -/* WaDisableSamplerPowerBypass:chv (pre-production hw) */ -WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN3 , -GEN8_SAMPLER_POWER_BYPASS_DIS ); +if (dev->pdev->revision <0x06 ) { +WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 ,DOP_CLOCK_GATING_DISABLE ); +WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN3 , +GEN8_SAMPLER_POWER_BYPASS_DIS ); + }return 0 ; }
Signature · 6 lines
2.1.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 40 lines · Arun Siluvery
WaDisableInstructionShootdown:chv WaForceEnableNonCoherent:chv WaHdcDisableFetchWhenMasked:chv WaDisableFenceDestinationToSLM:chv (pre-production)
s/WaDisableDopClockGating/WaDisableRowChickenDopClockGating, because another CHV WA is defined with the same name in
intel_pm.cfor a different reg.For: VIZ-4090
Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -5024,6 +5024,7 @@ enum punit_power_well {/* GEN8 chicken */ #define HDC_CHICKEN0 0x7300#define HDC_FORCE_NON_COHERENT (1<<4) +#define HDC_DONOT_FETCH_MEM_WHEN_MASKED (1<<11)#define HDC_FENCE_DEST_SLM_DISABLE (1<<14)/* WaCatErrorRejectionIssue */ @@ -5941,6 +5942,7 @@ enum punit_power_well {#define GEN9_DG_MIRROR_FIX_ENABLE (1<<5)#define GEN8_ROW_CHICKEN 0xe4f0 +#define INSTRUCTION_SHOOTDOWN_DISABLE (1<<9)#define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)#define STALL_DOP_GATING_DISABLE (1<<5)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 795
Quoted 9 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4
-1@@ -788,14 +788,30 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)struct drm_i915_private *dev_priv = dev->dev_private;/* WaDisablePartialInstShootdown:chv */ +/* WaDisableInstructionShootdown:chv */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN , -PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE ); +PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | + (dev->pdev->revision <0x06 ? +INSTRUCTION_SHOOTDOWN_DISABLE :0 ));
I think we should just drop the current early pre-prod workarounds, and not add more of them.
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 804
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4
-1/* WaDisableThreadStallDopClockGating:chv */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN ,STALL_DOP_GATING_DISABLE ); -/* WaDisableDopClockGating:chv (pre-production hw) */ +/* Use Force Non-Coherent whenever executing a 3D context. This is a +* workaround for a possible hang in the unlikely event a TLB +* invalidation occurs during a PSD flush. +*/
We haven't generally documented the w/as in any great detail. Does it help someone if we start doing that?
Quoted 20 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +10
-0+/* WaForceEnableNonCoherent:chv */ +/* WaHdcDisableFetchWhenMasked:chv */ +/* WaDisableFenceDestinationToSLM:chv (pre-production) */ +WA_SET_BIT_MASKED (HDC_CHICKEN0 , +HDC_FORCE_NON_COHERENT | +HDC_DONOT_FETCH_MEM_WHEN_MASKED | + (dev->pdev->revision <0x06 ? +HDC_FENCE_DEST_SLM_DISABLE :0 )); + +/* WaDisableRowChickenDopClockGating:chv (pre-production hw) */ WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 ,DOP_CLOCK_GATING_DISABLE );Signature · 6 lines
2.1.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 43 lines · Ville Syrjälä
Quoted 42 lines · Arun Siluvery
WaDisableInstructionShootdown:chv WaForceEnableNonCoherent:chv WaHdcDisableFetchWhenMasked:chv WaDisableFenceDestinationToSLM:chv (pre-production)
s/WaDisableDopClockGating/WaDisableRowChickenDopClockGating, because another CHV WA is defined with the same name in
intel_pm.cfor a different reg.For: VIZ-4090
Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -5024,6 +5024,7 @@ enum punit_power_well {/* GEN8 chicken */ #define HDC_CHICKEN0 0x7300#define HDC_FORCE_NON_COHERENT (1<<4) +#define HDC_DONOT_FETCH_MEM_WHEN_MASKED (1<<11)#define HDC_FENCE_DEST_SLM_DISABLE (1<<14)/* WaCatErrorRejectionIssue */ @@ -5941,6 +5942,7 @@ enum punit_power_well {#define GEN9_DG_MIRROR_FIX_ENABLE (1<<5)#define GEN8_ROW_CHICKEN 0xe4f0 +#define INSTRUCTION_SHOOTDOWN_DISABLE (1<<9)#define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)#define STALL_DOP_GATING_DISABLE (1<<5)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -788,14 +788,30 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)struct drm_i915_private *dev_priv = dev->dev_private;
Quoted 11 lines
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 795
Quoted 7 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4
-1/* WaDisablePartialInstShootdown:chv */ +/* WaDisableInstructionShootdown:chv */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN , -PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE ); +PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | + (dev->pdev->revision <0x06 ? +INSTRUCTION_SHOOTDOWN_DISABLE :0 ));I think we should just drop the current early pre-prod workarounds, and not add more of them.
ok I will drop this.
Is there any guideline on particular revision for bdw, chv below which we should drop that workaround?
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0/* WaDisableThreadStallDopClockGating:chv */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN ,STALL_DOP_GATING_DISABLE );
Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 804
Quoted 5 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4
-1-/* WaDisableDopClockGating:chv (pre-production hw) */ +/* Use Force Non-Coherent whenever executing a 3D context. This is a +* workaround for a possible hang in the unlikely event a TLB +* invalidation occurs during a PSD flush. +*/ We haven't generally documented the w/as in any great detail. Does it help someone if we start doing that?
This was already documented for bdw hence I included it for chv also.
regards
Arun
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +10
-0+/* WaForceEnableNonCoherent:chv */ +/* WaHdcDisableFetchWhenMasked:chv */ +/* WaDisableFenceDestinationToSLM:chv (pre-production) */ +WA_SET_BIT_MASKED (HDC_CHICKEN0 , +HDC_FORCE_NON_COHERENT | +HDC_DONOT_FETCH_MEM_WHEN_MASKED | + (dev->pdev->revision <0x06 ? +HDC_FENCE_DEST_SLM_DISABLE :0 )); + +/* WaDisableRowChickenDopClockGating:chv (pre-production hw) */ WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 ,DOP_CLOCK_GATING_DISABLE );
Quoted 8 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-1--2.1.2
_______________________________________________
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
Quoted 55 lines · Arun
Quoted 43 lines · Ville Syrjälä
Quoted 42 lines · Arun Siluvery
WaDisableInstructionShootdown:chv WaForceEnableNonCoherent:chv WaHdcDisableFetchWhenMasked:chv WaDisableFenceDestinationToSLM:chv (pre-production)
s/WaDisableDopClockGating/WaDisableRowChickenDopClockGating, because another CHV WA is defined with the same name in
intel_pm.cfor a different reg.For: VIZ-4090
Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -5024,6 +5024,7 @@ enum punit_power_well {/* GEN8 chicken */ #define HDC_CHICKEN0 0x7300#define HDC_FORCE_NON_COHERENT (1<<4) +#define HDC_DONOT_FETCH_MEM_WHEN_MASKED (1<<11)#define HDC_FENCE_DEST_SLM_DISABLE (1<<14)/* WaCatErrorRejectionIssue */ @@ -5941,6 +5942,7 @@ enum punit_power_well {#define GEN9_DG_MIRROR_FIX_ENABLE (1<<5)#define GEN8_ROW_CHICKEN 0xe4f0 +#define INSTRUCTION_SHOOTDOWN_DISABLE (1<<9)#define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)#define STALL_DOP_GATING_DISABLE (1<<5)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -788,14 +788,30 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)struct drm_i915_private *dev_priv = dev->dev_private;Quoted 11 lines
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 795
Quoted 7 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4
-1/* WaDisablePartialInstShootdown:chv */ +/* WaDisableInstructionShootdown:chv */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN , -PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE ); +PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | + (dev->pdev->revision <0x06 ? +INSTRUCTION_SHOOTDOWN_DISABLE :0 ));I think we should just drop the current early pre-prod workarounds, and not add more of them.
Quoted 3 lines
ok I will drop this.
Is there any guideline on particular revision for bdw, chv below which we should drop that workaround?
The usual rule is to drop all pre-prod w/as once we know what actually is the first production stepping. But obviosuly it's still a bit too early to do that on chv. At this time I would just drop all A step ones.
Quoted 15 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0/* WaDisableThreadStallDopClockGating:chv */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN ,STALL_DOP_GATING_DISABLE );Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 804
Quoted 5 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4
-1-/* WaDisableDopClockGating:chv (pre-production hw) */ +/* Use Force Non-Coherent whenever executing a 3D context. This is a +* workaround for a possible hang in the unlikely event a TLB +* invalidation occurs during a PSD flush. +*/ We haven't generally documented the w/as in any great detail. Does it help someone if we start doing that?
Quoted 1 line
This was already documented for bdw hence I included it for chv also.
OK. Being a bit more consistent between bdw and chv shouldn't hurt.
Quoted 26 lines
regards
ArunQuoted 22 lines
Quoted 21 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +10
-1+/* WaForceEnableNonCoherent:chv */ +/* WaHdcDisableFetchWhenMasked:chv */ +/* WaDisableFenceDestinationToSLM:chv (pre-production) */ +WA_SET_BIT_MASKED (HDC_CHICKEN0 , +HDC_FORCE_NON_COHERENT | +HDC_DONOT_FETCH_MEM_WHEN_MASKED | + (dev->pdev->revision <0x06 ? +HDC_FENCE_DEST_SLM_DISABLE :0 )); + +/* WaDisableRowChickenDopClockGating:chv (pre-production hw) */ WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 ,DOP_CLOCK_GATING_DISABLE ); --2.1.2
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 56 lines · Ville Syrjälä
Quoted 55 lines · Arun
Quoted 54 lines · Ville Syrjälä
Quoted 40 lines · Arun Siluvery
WaDisableInstructionShootdown:chv WaForceEnableNonCoherent:chv WaHdcDisableFetchWhenMasked:chv WaDisableFenceDestinationToSLM:chv (pre-production)
s/WaDisableDopClockGating/WaDisableRowChickenDopClockGating, because another CHV WA is defined with the same name in
intel_pm.cfor a different reg.For: VIZ-4090
Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -5024,6 +5024,7 @@ enum punit_power_well {/* GEN8 chicken */ #define HDC_CHICKEN0 0x7300#define HDC_FORCE_NON_COHERENT (1<<4) +#define HDC_DONOT_FETCH_MEM_WHEN_MASKED (1<<11)#define HDC_FENCE_DEST_SLM_DISABLE (1<<14)/* WaCatErrorRejectionIssue */ @@ -5941,6 +5942,7 @@ enum punit_power_well {#define GEN9_DG_MIRROR_FIX_ENABLE (1<<5)#define GEN8_ROW_CHICKEN 0xe4f0 +#define INSTRUCTION_SHOOTDOWN_DISABLE (1<<9)#define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)#define STALL_DOP_GATING_DISABLE (1<<5)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 795
Quoted 9 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +4
-1@@ -788,14 +788,30 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)struct drm_i915_private *dev_priv = dev->dev_private;/* WaDisablePartialInstShootdown:chv */ +/* WaDisableInstructionShootdown:chv */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN , -PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE ); +PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | + (dev->pdev->revision <0x06 ? +INSTRUCTION_SHOOTDOWN_DISABLE :0 ));I think we should just drop the current early pre-prod workarounds, and not add more of them.
Quoted 7 lines
Quoted 3 lines
ok I will drop this.
Is there any guideline on particular revision for bdw, chv below which we should drop that workaround?The usual rule is to drop all pre-prod w/as once we know what actually is the first production stepping. But obviosuly it's still a bit too early to do that on chv. At this time I would just drop all A step ones.
Here's an idea.
Make all pre-prod workarounds conditional to i915.preliminary_hw_support.
Remove all pre-prod workarounds for a platform when that platform no longer requires i915.preliminary_hw_support.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/chv: Add new WA and remove pre-production ones
In reply to Arun Siluvery+WaForceEnableNonCoherent:chv
+WaHdcDisableFetchWhenMasked:chv
-WaDisableDopClockGating:chv
-WaDisableSamplerPowerBypass:chv
-WaDisableGunitClockGating:chv
-WaDisableFfDopClockGating:chv
-WaDisableDopClockGating:chv
WaDisablePartialInstShootdown:chv and WaDisableThreadStallDopClockGating:chv are related to the same register so combine them.
v2: Remove pre-production WA instead of restricting them based on revision id (Ville)
For: VIZ-4090
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 12 ------------ drivers/gpu/drm/i915/intel_ringbuffer.c | 22 +++++++++++----------- 3 files changed, 12 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -5024,6 +5024,7 @@ enum punit_power_well {/* GEN8 chicken */ #define HDC_CHICKEN0 0x7300#define HDC_FORCE_NON_COHERENT (1<<4) +#define HDC_DONOT_FETCH_MEM_WHEN_MASKED (1<<11)#define HDC_FENCE_DEST_SLM_DISABLE (1<<14)/* WaCatErrorRejectionIssue */
drivers/gpu/drm/i915/intel_pm.c +0 -12
@@ -5944,18 +5944,6 @@ static void cherryview_init_clock_gating(struct drm_device *dev)/* WaDisableSDEUnitClockGating:chv */ I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) |GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); - -/* WaDisableGunitClockGating:chv (pre-production hw) */ -I915_WRITE (VLV_GUNIT_CLOCK_GATE ,I915_READ (VLV_GUNIT_CLOCK_GATE ) | -GINT_DIS ); - -/* WaDisableFfDopClockGating:chv (pre-production hw) */ -I915_WRITE (GEN6_RC_SLEEP_PSMI_CONTROL , -_MASKED_BIT_ENABLE (GEN8_FF_DOP_CLOCK_GATE_DISABLE )); - -/* WaDisableDopClockGating:chv (pre-production hw) */ -I915_WRITE (GEN6_UCGCTL1 ,I915_READ (GEN6_UCGCTL1 ) | -GEN6_EU_TCUNIT_CLOCK_GATE_DISABLE ); }static void g4x_init_clock_gating (struct drm_device *dev)
drivers/gpu/drm/i915/intel_ringbuffer.c +11 -11
@@ -788,20 +788,20 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)struct drm_i915_private *dev_priv = dev->dev_private;/* WaDisablePartialInstShootdown:chv */ -WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN , -PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE ); -/* WaDisableThreadStallDopClockGating:chv */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN , -STALL_DOP_GATING_DISABLE ); - -/* WaDisableDopClockGating:chv (pre-production hw) */ -WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 , -DOP_CLOCK_GATING_DISABLE ); +PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | +STALL_DOP_GATING_DISABLE ); -/* WaDisableSamplerPowerBypass:chv (pre-production hw) */ -WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN3 , -GEN8_SAMPLER_POWER_BYPASS_DIS ); +/* Use Force Non-Coherent whenever executing a 3D context. This is a +* workaround for a possible hang in the unlikely event a TLB +* invalidation occurs during a PSD flush. +*/ +/* WaForceEnableNonCoherent:chv */ +/* WaHdcDisableFetchWhenMasked:chv */ +WA_SET_BIT_MASKED (HDC_CHICKEN0 , +HDC_FORCE_NON_COHERENT | +HDC_DONOT_FETCH_MEM_WHEN_MASKED );return 0 ; }
Signature · 6 lines
2.1.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/chv: Add new WA and remove pre-production ones
Quoted 11 lines · Arun Siluvery
(quoted diff) +2
-5+WaForceEnableNonCoherent:chv +WaHdcDisableFetchWhenMasked:chv -WaDisableDopClockGating:chv -WaDisableSamplerPowerBypass:chv -WaDisableGunitClockGating:chv -WaDisableFfDopClockGating:chv -WaDisableDopClockGating:chvWaDisablePartialInstShootdown:chv and WaDisableThreadStallDopClockGating:chv are related to the same register so combine them.
Please split into at least two patches (one to add new w/as and another to remove old ones). Otherwise reverting is a pita in case we find that one of the dropped w/as was actually still needed.
Quoted 29 lines
v2: Remove pre-production WA instead of restricting them based on revision id (Ville)
For: VIZ-4090
Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 12 ------------ drivers/gpu/drm/i915/intel_ringbuffer.c | 22 +++++++++++----------- 3 files changed, 12 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -5024,6 +5024,7 @@ enum punit_power_well {/* GEN8 chicken */ #define HDC_CHICKEN0 0x7300#define HDC_FORCE_NON_COHERENT (1<<4) +#define HDC_DONOT_FETCH_MEM_WHEN_MASKED (1<<11)#define HDC_FENCE_DEST_SLM_DISABLE (1<<14)/* WaCatErrorRejectionIssue */ drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static void cherryview_init_clock_gating(struct drm_device *dev) · line 5950
Quoted 7 lines
drivers/gpu/drm/i915/intel_pm.c +0
-4@@ -5944,18 +5944,6 @@ static void cherryview_init_clock_gating(struct drm_device *dev)/* WaDisableSDEUnitClockGating:chv */ I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) |GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); - -/* WaDisableGunitClockGating:chv (pre-production hw) */ -I915_WRITE (VLV_GUNIT_CLOCK_GATE ,I915_READ (VLV_GUNIT_CLOCK_GATE ) | -GINT_DIS );
OK
drivers/gpu/drm/i915/intel_pm.c static void cherryview_init_clock_gating(struct drm_device *dev) · line 5954
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +0
-4- -/* WaDisableFfDopClockGating:chv (pre-production hw) */ -I915_WRITE (GEN6_RC_SLEEP_PSMI_CONTROL , -_MASKED_BIT_ENABLE (GEN8_FF_DOP_CLOCK_GATE_DISABLE ));
OK
drivers/gpu/drm/i915/intel_pm.c static void cherryview_init_clock_gating(struct drm_device *dev) · line 5958
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +0
-4- -/* WaDisableDopClockGating:chv (pre-production hw) */ -I915_WRITE (GEN6_UCGCTL1 ,I915_READ (GEN6_UCGCTL1 ) | -GEN6_EU_TCUNIT_CLOCK_GATE_DISABLE );
OK, I think. This was the weird w/a where it seemed hard to figure out what it needed. Nothing in BSpec about needing this bit on chv.
Quoted 11 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0}static void g4x_init_clock_gating (struct drm_device *dev)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -788,20 +788,20 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)struct drm_i915_private *dev_priv = dev->dev_private;/* WaDisablePartialInstShootdown:chv */
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 800
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-8-WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN , -PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE ); -/* WaDisableThreadStallDopClockGating:chv */ WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN, -STALL_DOP_GATING_DISABLE ); - -/* WaDisableDopClockGating:chv (pre-production hw) */ -WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 , -DOP_CLOCK_GATING_DISABLE );
OK, again the weird w/a but Bspec seems to agree at least.
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 794
Quoted 2 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +2
-0+PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | + STALL_DOP_GATING_DISABLE);
Bspec says bit 5 is MBZ now, and yet the w/a database says it's forever. And the hardware accepts 1 there so it's not like many other MBZ bits that you can't set even if you try. Also Bspec has three different definitions for this bit on gen8, all disagree with each other and one definiton even manages to disagree with itself. And reading the hsd stuff I'm not the only that has been confused by this, and yet I see no conclusion there as to how this bit should be configured.
Oh well, I guess we can leave it set for now and maybe eventually someone will figure out what we're supposed to do.
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 804
Quoted 4 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-3-/* WaDisableSamplerPowerBypass:chv (pre-production hw) */ -WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN3 , -GEN8_SAMPLER_POWER_BYPASS_DIS );
OK
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 804
Quoted 9 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +9
-0+/* Use Force Non-Coherent whenever executing a 3D context. This is a +* workaround for a possible hang in the unlikely event a TLB +* invalidation occurs during a PSD flush. +*/ +/* WaForceEnableNonCoherent:chv */ +/* WaHdcDisableFetchWhenMasked:chv */ +WA_SET_BIT_MASKED (HDC_CHICKEN0 , +HDC_FORCE_NON_COHERENT | +HDC_DONOT_FETCH_MEM_WHEN_MASKED );
OK
Right, so split it up a bit and you can add
to the patches.
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0return 0 ; }Signature · 6 lines
2.1.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/chv: Add new WA and remove pre-production ones
Quoted 9 lines · Ville Syrjälä
Quoted 8 lines · Arun Siluvery
(quoted diff) +2
-5+WaForceEnableNonCoherent:chv +WaHdcDisableFetchWhenMasked:chv -WaDisableDopClockGating:chv -WaDisableSamplerPowerBypass:chv -WaDisableGunitClockGating:chv -WaDisableFfDopClockGating:chv -WaDisableDopClockGating:chv
Quoted 8 lines
Quoted 3 lines
WaDisablePartialInstShootdown:chv and WaDisableThreadStallDopClockGating:chv are related to the same register so combine them.
Please split into at least two patches (one to add new w/as and another to remove old ones). Otherwise reverting is a pita in case we find that one of the dropped w/as was actually still needed.
I thought of doing that but then combined them as these are early pre-production ones and we may not need them in future but I agree splitting them helps in reverting them if required.
Quoted 89 lines
Quoted 29 lines
v2: Remove pre-production WA instead of restricting them based on revision id (Ville)
For: VIZ-4090
Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 12 ------------ drivers/gpu/drm/i915/intel_ringbuffer.c | 22 +++++++++++----------- 3 files changed, 12 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -5024,6 +5024,7 @@ enum punit_power_well {/* GEN8 chicken */ #define HDC_CHICKEN0 0x7300#define HDC_FORCE_NON_COHERENT (1<<4) +#define HDC_DONOT_FETCH_MEM_WHEN_MASKED (1<<11)#define HDC_FENCE_DEST_SLM_DISABLE (1<<14)/* WaCatErrorRejectionIssue */ drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c static void cherryview_init_clock_gating(struct drm_device *dev) · line 5950
Quoted 7 lines
drivers/gpu/drm/i915/intel_pm.c +0
-4@@ -5944,18 +5944,6 @@ static void cherryview_init_clock_gating(struct drm_device *dev)/* WaDisableSDEUnitClockGating:chv */ I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) |GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); - -/* WaDisableGunitClockGating:chv (pre-production hw) */ -I915_WRITE (VLV_GUNIT_CLOCK_GATE ,I915_READ (VLV_GUNIT_CLOCK_GATE ) | -GINT_DIS );OK
drivers/gpu/drm/i915/intel_pm.c static void cherryview_init_clock_gating(struct drm_device *dev) · line 5954
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +0
-4- -/* WaDisableFfDopClockGating:chv (pre-production hw) */ -I915_WRITE (GEN6_RC_SLEEP_PSMI_CONTROL , -_MASKED_BIT_ENABLE (GEN8_FF_DOP_CLOCK_GATE_DISABLE ));OK
drivers/gpu/drm/i915/intel_pm.c static void cherryview_init_clock_gating(struct drm_device *dev) · line 5958
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +0
-4- -/* WaDisableDopClockGating:chv (pre-production hw) */ -I915_WRITE (GEN6_UCGCTL1 ,I915_READ (GEN6_UCGCTL1 ) | -GEN6_EU_TCUNIT_CLOCK_GATE_DISABLE );OK, I think. This was the weird w/a where it seemed hard to figure out what it needed. Nothing in BSpec about needing this bit on chv.
Quoted 11 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0}static void g4x_init_clock_gating (struct drm_device *dev)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -788,20 +788,20 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)struct drm_i915_private *dev_priv = dev->dev_private;/* WaDisablePartialInstShootdown:chv */ drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 800
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-8-WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN , -PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE ); -/* WaDisableThreadStallDopClockGating:chv */ WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN, -STALL_DOP_GATING_DISABLE ); - -/* WaDisableDopClockGating:chv (pre-production hw) */ -WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 , -DOP_CLOCK_GATING_DISABLE );OK, again the weird w/a but Bspec seems to agree at least.
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 794
Quoted 2 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +2
-0+PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | + STALL_DOP_GATING_DISABLE);Bspec says bit 5 is MBZ now, and yet the w/a database says it's forever. And the hardware accepts 1 there so it's not like many other MBZ bits that you can't set even if you try. Also Bspec has three different definitions for this bit on gen8, all disagree with each other and one definiton even manages to disagree with itself. And reading the hsd stuff I'm not the only that has been confused by this, and yet I see no conclusion there as to how this bit should be configured.
Quoted 3 lines
Oh well, I guess we can leave it set for now and maybe eventually someone will figure out what we're supposed to do.
I am using w/a database as reference and it says forever, spec seems to disagree but probably not yet updated.
regards
Arun
Quoted 19 lines
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 804
Quoted 4 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-3-/* WaDisableSamplerPowerBypass:chv (pre-production hw) */ -WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN3 , -GEN8_SAMPLER_POWER_BYPASS_DIS );OK
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 804
Quoted 9 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +9
-0+/* Use Force Non-Coherent whenever executing a 3D context. This is a +* workaround for a possible hang in the unlikely event a TLB +* invalidation occurs during a PSD flush. +*/ +/* WaForceEnableNonCoherent:chv */ +/* WaHdcDisableFetchWhenMasked:chv */ +WA_SET_BIT_MASKED (HDC_CHICKEN0 , +HDC_FORCE_NON_COHERENT | +HDC_DONOT_FETCH_MEM_WHEN_MASKED );OK
Quoted 17 lines
Right, so split it up a bit and you can add
Reviewed-by Ville Syrjälä <[email protected]>to the patches.
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-1return 0 ; } --2.1.2
_______________________________________________
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