drm/i915/chv: Add new WA and remove pre-production ones
Subsystems (2)
cover drm/i915/chv: Add new WA and remove pre-production ones
The patches in this series adds two new workarounds for CHV and removes pre-production ones.
Based on review comments from Ville, add/remove patches are split-up which helps in reverting them if required.
The initial patch can be found at,
https://patchwork.kernel.org/patch/5178021/
Arun Siluvery (3):
drm/i915/chv: Remove pre-production workarounds
drm/i915/chv: Combine GEN8_ROW_CHICKEN w/a
drm/i915/chv: Add new workarounds for chv
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(-)
Signature · 6 lines
2.1.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/3 drm/i915/chv: Remove pre-production workarounds
-WaDisableDopClockGating:chv
-WaDisableSamplerPowerBypass:chv
-WaDisableGunitClockGating:chv
-WaDisableFfDopClockGating:chv
-WaDisableDopClockGating:chv
v2: Remove pre-production WA instead of restricting them based on revision id (Ville)
For: VIZ-4090
--- drivers/gpu/drm/i915/intel_pm.c | 12 ------------ drivers/gpu/drm/i915/intel_ringbuffer.c | 8 -------- 2 files changed, 20 deletions(-)
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 +0 -8
@@ -795,14 +795,6 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)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 ); - -/* WaDisableSamplerPowerBypass:chv (pre-production hw) */ -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
PATCH 2/3 drm/i915/chv: Combine GEN8_ROW_CHICKEN w/a
In reply to Arun SiluveryWaDisablePartialInstShootdown:chv and WaDisableThreadStallDopClockGating:chv are related to the same register so combine them.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -4
@@ -788,12 +788,10 @@ 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 ); +PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | +STALL_DOP_GATING_DISABLE );return 0 ; }
Signature · 6 lines
2.1.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915/chv: Add new workarounds for chv
In reply to Arun Siluvery+WaForceEnableNonCoherent:chv
+WaHdcDisableFetchWhenMasked:chv
For: VIZ-4090
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_ringbuffer.c | 10 ++++++++++ 2 files changed, 11 insertions(+)
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_ringbuffer.c +10 -0
@@ -793,6 +793,16 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | STALL_DOP_GATING_DISABLE); +/* 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
Quoted 9 lines · Arun Siluvery
The patches in this series adds two new workarounds for CHV and removes pre-production ones.
Based on review comments from Ville, add/remove patches are split-up which helps in reverting them if required.
The initial patch can be found at,
https://patchwork.kernel.org/patch/5178021/
Hi Ville,
Patches are split-up as you suggested. Please let me know if further changes are required.
regards
Arun
Quoted 10 lines
Arun Siluvery (3):
drm/i915/chv: Remove pre-production workarounds drm/i915/chv: CombineGEN8_ROW_CHICKENw/a drm/i915/chv: Add new workarounds for chvdrivers/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(-)
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Arun Siluvery
The patches in this series adds two new workarounds for CHV and removes pre-production ones.
Based on review comments from Ville, add/remove patches are split-up which helps in reverting them if required.
Quoted 7 lines
The initial patch can be found at,
https://patchwork.kernel.org/patch/5178021/Arun Siluvery (3):
drm/i915/chv: Remove pre-production workarounds
drm/i915/chv: CombineGEN8_ROW_CHICKENw/a
drm/i915/chv: Add new workarounds for chv
Looks good. For the series:
Quoted 13 lines
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(-)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 10 lines · Ville Syrjälä
Quoted 9 lines · Arun Siluvery
The patches in this series adds two new workarounds for CHV and removes pre-production ones.
Based on review comments from Ville, add/remove patches are split-up which helps in reverting them if required.
The initial patch can be found at,
https://patchwork.kernel.org/patch/5178021/
Quoted 7 lines
Quoted 4 lines
Arun Siluvery (3):
drm/i915/chv: Remove pre-production workarounds
drm/i915/chv: CombineGEN8_ROW_CHICKENw/a
drm/i915/chv: Add new workarounds for chvLooks good. For the series:
Reviewed-by Ville Syrjälä <[email protected]>
All three merged, thanks for patches and review.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx