drm/i915/icl: Introduce initial Icelake Workarounds
Subsystems (2)
PATCH 1/14 drm/i915/icl: Introduce initial Icelake Workarounds
Inherit workarounds from previous platforms that are still valid for Icelake.
v2: GEN7_ROW_CHICKEN2 is masked
v3:
- Removed the TODO comment about WA_SET_BIT for WaInPlaceDecompressionHang, since this has been fixed already in upstream.
- Squashed with this patch from Paulo Zanoni <[email protected]>:
drm/i915/icl: add icelake_init_clock_gating()
- Squashed with this patch from Oscar Mateo <[email protected]>:
drm/i915/icl: WaForceEnableNonCoherent
- WaPushConstantDereferenceHoldDisable is now Wa_1604370585 and applies to B0 as well
- WaPipeControlBefore3DStateSamplePattern WABB was being incorrectly applied to ICL
--- drivers/gpu/drm/i915/i915_drv.h | 9 +++++++++ drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++-- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_engine_cs.c | 25 +++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_lrc.c | 2 ++ drivers/gpu/drm/i915/intel_pm.c | 19 ++++++++++++++++++- 6 files changed, 57 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +9 -0
@@ -2458,6 +2458,15 @@ static inline unsigned int i915_sg_segment_size(void)#define IS_CNL_REVID (p, since, until) \ (IS_CANNONLAKE(p) && IS_REVID(p, since, until)) +#define ICL_REVID_A0 0x0 +#define ICL_REVID_A2 0x1 +#define ICL_REVID_B0 0x3 +#define ICL_REVID_B2 0x4 +#define ICL_REVID_C0 0x5 + +#define IS_ICL_REVID (dev_priv, since, until) \ + (IS_ICELAKE(dev_priv) && IS_REVID(dev_priv, since, until)) +/* * The genX designation typically refers to the render engine, so render * capability related checks should use IS_GEN, while display and other checks
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -2
@@ -2140,12 +2140,12 @@ static void gtt_write_workarounds(struct drm_i915_private *dev_priv)* called on driver load and after a GPU reset, so you can place * workarounds here even if they get overwritten by GPU reset. */ -/* WaIncreaseDefaultTLBEntries:chv,bdw,skl,bxt,kbl,glk,cfl,cnl */ +/* WaIncreaseDefaultTLBEntries:chv,bdw,skl,bxt,kbl,glk,cfl,cnl,icl */ if (IS_BROADWELL (dev_priv))I915_WRITE (GEN8_L3_LRA_1_GPGPU ,GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW );else if (IS_CHERRYVIEW (dev_priv))I915_WRITE (GEN8_L3_LRA_1_GPGPU ,GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_CHV ); -else if (IS_GEN9_BC (dev_priv) ||IS_GEN10 (dev_priv)) +else if (IS_GEN9_BC (dev_priv) ||IS_GEN10 (dev_priv) ||IS_GEN11 (dev_priv))I915_WRITE (GEN8_L3_LRA_1_GPGPU ,GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_SKL );else if (IS_GEN9_LP (dev_priv))I915_WRITE (GEN8_L3_LRA_1_GPGPU ,GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_BXT );
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -7184,6 +7184,7 @@ enum {/* GEN8 chicken */ #define HDC_CHICKEN0 _MMIO(0x7300)#define CNL_HDC_CHICKEN0 _MMIO(0xE5F0) +#define ICL_HDC_CHICKEN0 _MMIO(0xE5F4)#define HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE (1<<15)#define HDC_FENCE_DEST_SLM_DISABLE (1<<14)#define HDC_DONOT_FETCH_MEM_WHEN_MASKED (1<<11)
drivers/gpu/drm/i915/intel_engine_cs.c +25 -0
@@ -1467,6 +1467,29 @@ static int cfl_init_workarounds(struct intel_engine_cs *engine)return 0 ; } +static int icl_init_workarounds (struct intel_engine_cs *engine) +{ +struct drm_i915_private *dev_priv = engine->i915; + +/* Wa_1604370585:icl (pre-prod) +* Formerly known as WaPushConstantDereferenceHoldDisable +*/ +if (IS_ICL_REVID (dev_priv,ICL_REVID_A0 ,ICL_REVID_B0 )) +WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 , +PUSH_CONSTANT_DEREF_DISABLE ); + +/* WaForceEnableNonCoherent:icl +* This is not the same workaround as in early Gen9 platforms, where +* lacking this could cause system hangs, but coherency performance +* overhead is high and only a few compute workloads really need it +* (the register is whitelisted in hardware now, so UMDs can opt in +* for coherency if they have a good reason). +*/ +WA_SET_BIT_MASKED (ICL_HDC_CHICKEN0 ,HDC_FORCE_NON_COHERENT ); + +return 0 ; +} +int init_workarounds_ring (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->i915;
@@ -1494,6 +1517,8 @@ int init_workarounds_ring(struct intel_engine_cs *engine) err =cfl_init_workarounds (engine); else if (IS_CANNONLAKE(dev_priv)) err =cnl_init_workarounds (engine); + else if (IS_ICELAKE(dev_priv)) + err =icl_init_workarounds (engine); else err =0 ;if (err)
drivers/gpu/drm/i915/intel_lrc.c +2 -0
@@ -1573,6 +1573,8 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)return -EINVAL ;switch (INTEL_GEN (engine->i915)) { +case 11 : +return 0 ;case 10 : wa_bb_fn[0 ] = gen10_init_indirectctx_bb; wa_bb_fn[1 ] =NULL ;
drivers/gpu/drm/i915/intel_pm.c +18 -1
@@ -8499,6 +8499,21 @@ static void cnp_init_clock_gating(struct drm_i915_private *dev_priv) CNP_PWM_CGE_GATING_DISABLE); } +static void icl_init_clock_gating (struct drm_i915_private *dev_priv) +{ +/* This is not an Wa. Enable for better image quality */ +I915_WRITE (_3D_CHICKEN3, +_MASKED_BIT_ENABLE (_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE)); + +/* WaInPlaceDecompressionHang:icl */ +I915_WRITE (GEN9_GAMT_ECO_REG_RW_IA , (I915_READ (GEN9_GAMT_ECO_REG_RW_IA ) | +GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS )); + +/* WaPipelineFlushCoherentLines:icl */ +I915_WRITE (GEN8_L3SQCREG4 , (I915_READ (GEN8_L3SQCREG4 ) | +GEN8_LQSC_FLUSH_COHERENT_LINES )); +} +static void cnl_init_clock_gating (struct drm_i915_private *dev_priv) {u32 val;
@@ -9015,7 +9030,9 @@ static void nop_init_clock_gating(struct drm_i915_private *dev_priv)*/ void intel_init_clock_gating_hooks (struct drm_i915_private *dev_priv) { -if (IS_CANNONLAKE (dev_priv)) +if (IS_ICELAKE (dev_priv)) + dev_priv->display.init_clock_gating = icl_init_clock_gating; +else if (IS_CANNONLAKE (dev_priv)) dev_priv->display.init_clock_gating = cnl_init_clock_gating;else if (IS_COFFEELAKE (dev_priv)) dev_priv->display.init_clock_gating = cfl_init_clock_gating;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/14 drm/i915/icl: WaGAPZPriorityScheme
The default GAPZ arbitrer priority value at power-on has been found to be incorrect.
v2: Now renamed to Wa_1405543622
--- drivers/gpu/drm/i915/i915_reg.h | 5 +++-- drivers/gpu/drm/i915/intel_pm.c | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +3 -2
@@ -8196,8 +8196,9 @@ enum {#define GEN8_DOP_CLOCK_GATE_GUC_ENABLE (1<<4)#define GEN8_DOP_CLOCK_GATE_MEDIA_ENABLE (1<<6) -#define GEN8_GARBCNTL _MMIO(0xB004) -#define GEN9_GAPS_TSV_CREDIT_DISABLE (1<<7) +#define GEN8_GARBCNTL _MMIO(0xB004) +#define GEN9_GAPS_TSV_CREDIT_DISABLE (1 << 7) +#define GEN11_ARBITRATION_PRIO_ORDER_MASK (0x3f << 22)/* IVYBRIDGE DPF */ #define GEN7_L3CDERRST1 (slice) _MMIO(0xB008 + (slice) * 0x200)/* L3CD Error Status 1 */
drivers/gpu/drm/i915/intel_pm.c +6 -0
@@ -8512,6 +8512,12 @@ static void icl_init_clock_gating(struct drm_i915_private *dev_priv)/* WaPipelineFlushCoherentLines:icl */ I915_WRITE (GEN8_L3SQCREG4 , (I915_READ (GEN8_L3SQCREG4 ) |GEN8_LQSC_FLUSH_COHERENT_LINES )); + +/* Wa_1405543622:icl +* Formerly known as WaGAPZPriorityScheme +*/ +I915_WRITE (GEN8_GARBCNTL , (I915_READ (GEN8_GARBCNTL ) | +GEN11_ARBITRATION_PRIO_ORDER_MASK )); }static void cnl_init_clock_gating (struct drm_i915_private *dev_priv)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/14 drm/i915/icl: WaModifyGamTlbPartitioning
In reply to Oscar MateoAdjust default GAM TLB partitioning for performance reasons.
v2: Only touch the bits that we really need
--- drivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_pm.c | 5 +++++ 2 files changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -8200,6 +8200,11 @@ enum {#define GEN9_GAPS_TSV_CREDIT_DISABLE (1 << 7)#define GEN11_ARBITRATION_PRIO_ORDER_MASK (0x3f << 22) +#define GEN11_GACB_PERF_CTRL _MMIO(0x4B80) +#define GEN11_HASH_CTRL_MASK (0x3 << 12 | 0xf << 0) +#define GEN11_HASH_CTRL_BIT0 (1 << 0) +#define GEN11_HASH_CTRL_BIT4 (1 << 12) +/* IVYBRIDGE DPF */ #define GEN7_L3CDERRST1 (slice) _MMIO(0xB008 + (slice) * 0x200)/* L3CD Error Status 1 */ #define GEN7_L3CDERRST1_ROW_MASK (0x7ff<<14)
drivers/gpu/drm/i915/intel_pm.c +5 -0
@@ -8518,6 +8518,11 @@ static void icl_init_clock_gating(struct drm_i915_private *dev_priv)*/ I915_WRITE (GEN8_GARBCNTL , (I915_READ (GEN8_GARBCNTL ) |GEN11_ARBITRATION_PRIO_ORDER_MASK )); + +/* WaModifyGamTlbPartitioning:icl */ +I915_WRITE (GEN11_GACB_PERF_CTRL , + ((I915_READ (GEN11_GACB_PERF_CTRL ) & ~GEN11_HASH_CTRL_MASK ) | +GEN11_HASH_CTRL_BIT0 |GEN11_HASH_CTRL_BIT4 )); }static void cnl_init_clock_gating (struct drm_i915_private *dev_priv)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/14 drm/i915/icl: WaL3BankAddressHashing
In reply to Oscar MateoRevert to an L3 non-hash model, for performance reasons.
v2:
- Place the WA name above the actual change
- Improve the register naming
v3:
- Rebased
- Renamed to Wa_1604223664
--- drivers/gpu/drm/i915/i915_reg.h | 6 ++++++ drivers/gpu/drm/i915/intel_pm.c | 20 ++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +6 -0
@@ -8199,6 +8199,12 @@ enum {#define GEN8_GARBCNTL _MMIO(0xB004)#define GEN9_GAPS_TSV_CREDIT_DISABLE (1 << 7)#define GEN11_ARBITRATION_PRIO_ORDER_MASK (0x3f << 22) +#define GEN11_HASH_CTRL_EXCL_MASK (0x7f << 0) +#define GEN11_HASH_CTRL_EXCL_BIT0 (1 << 0) + +#define GEN11_GLBLINVL _MMIO(0xB404) +#define GEN11_BANK_HASH_ADDR_EXCL_BIT0 (1 << 0) +#define GEN11_BANK_HASH_ADDR_EXCL_MASK (0x3f << 5)#define GEN11_GACB_PERF_CTRL _MMIO(0x4B80)#define GEN11_HASH_CTRL_MASK (0x3 << 12 | 0xf << 0)
drivers/gpu/drm/i915/intel_pm.c +16 -4
@@ -8513,11 +8513,23 @@ static void icl_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (GEN8_L3SQCREG4 , (I915_READ (GEN8_L3SQCREG4 ) |GEN8_LQSC_FLUSH_COHERENT_LINES )); -/* Wa_1405543622:icl -* Formerly known as WaGAPZPriorityScheme +I915_WRITE (GEN8_GARBCNTL , +/* Wa_1604223664:icl +* Formerly known as WaL3BankAddressHashing +*/ + ((I915_READ (GEN8_GARBCNTL ) & ~GEN11_HASH_CTRL_EXCL_MASK ) | +GEN11_HASH_CTRL_EXCL_BIT0 | +/* Wa_1405543622:icl +* Formerly known as WaGAPZPriorityScheme +*/ +GEN11_ARBITRATION_PRIO_ORDER_MASK )); + +/* Wa_1604223664:icl +* Formerly known as WaL3BankAddressHashing */ -I915_WRITE (GEN8_GARBCNTL , (I915_READ (GEN8_GARBCNTL ) | -GEN11_ARBITRATION_PRIO_ORDER_MASK )); +I915_WRITE (GEN11_GLBLINVL , + ((I915_READ (GEN11_GLBLINVL ) & ~GEN11_BANK_HASH_ADDR_EXCL_MASK ) | +GEN11_BANK_HASH_ADDR_EXCL_BIT0 ));/* WaModifyGamTlbPartitioning:icl */ I915_WRITE(GEN11_GACB_PERF_CTRL,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/14 drm/i915/icl: WaDisableCleanEvicts
In reply to Oscar MateoAvoids an undefined LLC behavior.
BSpec: 9613
v2: Renamed to Wa_1405733216
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 6 ++++++ 2 files changed, 7 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -7178,6 +7178,7 @@ enum {#define L3SQ_URB_READ_CAM_MATCH_DISABLE (1<<27)#define GEN8_L3SQCREG4 _MMIO(0xb118) +#define GEN11_LQSC_CLEAN_EVICT_DISABLE (1<<6)#define GEN8_LQSC_RO_PERF_DIS (1<<27)#define GEN8_LQSC_FLUSH_COHERENT_LINES (1<<21)
drivers/gpu/drm/i915/intel_pm.c +6 -0
@@ -8513,6 +8513,12 @@ static void icl_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (GEN8_L3SQCREG4 , (I915_READ (GEN8_L3SQCREG4 ) |GEN8_LQSC_FLUSH_COHERENT_LINES )); +/* Wa_1405733216:icl +* Formerly known as WaDisableCleanEvicts +*/ +I915_WRITE (GEN8_L3SQCREG4 , (I915_READ (GEN8_L3SQCREG4 ) | +GEN11_LQSC_CLEAN_EVICT_DISABLE )); + I915_WRITE(GEN8_GARBCNTL,/* Wa_1604223664:icl * Formerly known as WaL3BankAddressHashing
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/14 drm/i915/icl: WaDisableImprovedTdlClkGating
In reply to Oscar MateoRevert to the legacy implementation.
v2: GEN7_ROW_CHICKEN2 is masked
v3:
- Rebased
- Renamed to Wa_2006611047
- A0 and B0 only
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_engine_cs.c | 7 +++++++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -8251,6 +8251,7 @@ enum {#define GEN7_ROW_CHICKEN2_GT2 _MMIO(0xf4f4)#define DOP_CLOCK_GATING_DISABLE (1<<0)#define PUSH_CONSTANT_DEREF_DISABLE (1<<8) +#define GEN11_TDL_CLOCK_GATING_FIX_DISABLE (1<<1)#define HSW_ROW_CHICKEN3 _MMIO(0xe49c)#define HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE (1 << 6)
drivers/gpu/drm/i915/intel_engine_cs.c +7 -0
@@ -1487,6 +1487,13 @@ static int icl_init_workarounds(struct intel_engine_cs *engine)*/ WA_SET_BIT_MASKED (ICL_HDC_CHICKEN0 ,HDC_FORCE_NON_COHERENT ); +/* Wa_2006611047:icl +* Formerly known as WaDisableImprovedTdlClkGating +*/ +if (IS_ICL_REVID (dev_priv,ICL_REVID_A0 ,ICL_REVID_B0 )) +WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 , +GEN11_TDL_CLOCK_GATING_FIX_DISABLE ); +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/14 drm/i915/icl: WaCL2SFHalfMaxAlloc
In reply to Oscar MateoThis workarounds an issue with insufficient storage for the CL2 and SF units.
v2: Renamed to Wa_1405766107
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_pm.c | 7 +++++++ 2 files changed, 11 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -8212,6 +8212,10 @@ enum {#define GEN11_HASH_CTRL_BIT0 (1 << 0)#define GEN11_HASH_CTRL_BIT4 (1 << 12) +#define GEN11_LSN_UNSLCVC _MMIO(0xB43C) +#define GEN11_LSN_UNSLCVC_GAFS_HALF_CL2_MACALLOC (1 << 9) +#define GEN11_LSN_UNSLCVC_GAFS_HALF_SF_MAXALLOC (1 << 7) +/* IVYBRIDGE DPF */ #define GEN7_L3CDERRST1 (slice) _MMIO(0xB008 + (slice) * 0x200)/* L3CD Error Status 1 */ #define GEN7_L3CDERRST1_ROW_MASK (0x7ff<<14)
drivers/gpu/drm/i915/intel_pm.c +7 -0
@@ -8541,6 +8541,13 @@ static void icl_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (GEN11_GACB_PERF_CTRL , ((I915_READ (GEN11_GACB_PERF_CTRL ) & ~GEN11_HASH_CTRL_MASK ) |GEN11_HASH_CTRL_BIT0 |GEN11_HASH_CTRL_BIT4 )); + +/* Wa_1405766107:icl +* Formerly known as WaCL2SFHalfMaxAlloc +*/ +I915_WRITE (GEN11_LSN_UNSLCVC , (I915_READ (GEN11_LSN_UNSLCVC ) | +GEN11_LSN_UNSLCVC_GAFS_HALF_SF_MAXALLOC | +GEN11_LSN_UNSLCVC_GAFS_HALF_CL2_MACALLOC )); }static void cnl_init_clock_gating (struct drm_i915_private *dev_priv)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/14 drm/i915/icl: WaDisCtxReload
In reply to Oscar MateoRevert to the legacy implementation to avoid a system hang.
v2: Correct the address for GAMW_ECO_DEV_RW_IA_REG
v3: Renamed to Wa_220166154
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 6 ++++++ 2 files changed, 9 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -8216,6 +8216,9 @@ enum {#define GEN11_LSN_UNSLCVC_GAFS_HALF_CL2_MACALLOC (1 << 9)#define GEN11_LSN_UNSLCVC_GAFS_HALF_SF_MAXALLOC (1 << 7) +#define GAMW_ECO_DEV_RW_IA_REG _MMIO(0x4080) +#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7) +/* IVYBRIDGE DPF */ #define GEN7_L3CDERRST1 (slice) _MMIO(0xB008 + (slice) * 0x200)/* L3CD Error Status 1 */ #define GEN7_L3CDERRST1_ROW_MASK (0x7ff<<14)
drivers/gpu/drm/i915/intel_pm.c +6 -0
@@ -8519,6 +8519,12 @@ static void icl_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (GEN8_L3SQCREG4 , (I915_READ (GEN8_L3SQCREG4 ) |GEN11_LQSC_CLEAN_EVICT_DISABLE )); +/* Wa_220166154:icl +* Formerly known as WaDisCtxReload +*/ +I915_WRITE (GAMW_ECO_DEV_RW_IA_REG , (I915_READ (GAMW_ECO_DEV_RW_IA_REG ) | +GAMW_ECO_DEV_CTX_RELOAD_DISABLE )); + I915_WRITE(GEN8_GARBCNTL,/* Wa_1604223664:icl * Formerly known as WaL3BankAddressHashing
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/14 drm/i915/icl: WaSendPushConstantsFromMMIO
In reply to Oscar MateoAllows UMDs to set 'Disable Gather at Set Shader Common Slice'.
Do Linux UMDs make use of this? This change has been security reviewed and the whitelisting approved. Virtualization of other OSes could certainly use it...
v2: Rebased
--- drivers/gpu/drm/i915/intel_engine_cs.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_engine_cs.c +6 -0
@@ -1470,6 +1470,7 @@ static int cfl_init_workarounds(struct intel_engine_cs *engine)static int icl_init_workarounds (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->i915; +int ret;/* Wa_1604370585:icl (pre-prod) * Formerly known as WaPushConstantDereferenceHoldDisable
@@ -1494,6 +1495,11 @@ static int icl_init_workarounds(struct intel_engine_cs *engine)WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 ,GEN11_TDL_CLOCK_GATING_FIX_DISABLE ); +/* WaSendPushConstantsFromMMIO:icl */ + ret =wa_ring_whitelist_reg (engine,COMMON_SLICE_CHICKEN2 ); +if (ret) +return ret; +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/14 drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken2
In reply to Oscar MateoRequired to dinamically set 'Small PL Lossless Fix Enable'
Do Linux UMDs make use of this? This change has been security reviewed and the whitelisting approved. Virtualization of other OSes could certainly use it.
--- drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_engine_cs.c +5 -0
@@ -1409,6 +1409,11 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine)if (ret)return ret; +/* WaAllowUMDToModifyHalfSliceChicken2:icl */ + ret =wa_ring_whitelist_reg (engine,HALF_SLICE_CHICKEN2 ); +if (ret) +return ret; +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/14 drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7
In reply to Oscar MateoRequired to dinamically set 'Trilinear Filter Quality Mode'
Do Linux UMDs make use of this? This change has been security reviewed and the whitelisting approved. Virtualization of other OSes could certainly use it.
--- drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_engine_cs.c +5 -0
@@ -1414,6 +1414,11 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine)if (ret)return ret; +/* WaAllowUMDToModifyHalfSliceChicken7:icl */ + ret =wa_ring_whitelist_reg (engine,GEN9_HALF_SLICE_CHICKEN7 ); +if (ret) +return ret; +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/14 drm/i915/icl: WaAllowUmdWriteTRTTRootTable
In reply to Oscar MateoRequired for TR-TT (Tiled Resource Translation Table) support.
Do Linux UMDs make use of this? This change has been security reviewed and the whitelisting approved. Virtualization of other OSes could certainly use it.
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_engine_cs.c | 8 ++++++++ 2 files changed, 11 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -8219,6 +8219,9 @@ enum {#define GAMW_ECO_DEV_RW_IA_REG _MMIO(0x4080)#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7) +#define TR_VA_TTL3_PTR_DW0 _MMIO(0x4DE0) +#define TR_VA_TTL3_PTR_DW1 _MMIO(0x4DE4) +/* IVYBRIDGE DPF */ #define GEN7_L3CDERRST1 (slice) _MMIO(0xB008 + (slice) * 0x200)/* L3CD Error Status 1 */ #define GEN7_L3CDERRST1_ROW_MASK (0x7ff<<14)
drivers/gpu/drm/i915/intel_engine_cs.c +8 -0
@@ -1419,6 +1419,14 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine)if (ret)return ret; +/* WaAllowUmdWriteTRTTRootTable:icl */ + ret =wa_ring_whitelist_reg (engine,TR_VA_TTL3_PTR_DW0 ); +if (ret) +return ret; + ret =wa_ring_whitelist_reg (engine,TR_VA_TTL3_PTR_DW1 ); +if (ret) +return ret; +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 13/14 drm/i915/icl: WaEnableStateCacheRedirectToCS
In reply to Oscar MateoRedirects the state cache to the CS Command buffer section for performance reasons.
v2: Rebased
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_engine_cs.c | 4 ++++ 2 files changed, 5 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -7150,6 +7150,7 @@ enum {#define DISABLE_PIXEL_MASK_CAMMING (1<<14)#define GEN9_SLICE_COMMON_ECO_CHICKEN1 _MMIO(0x731c) +#define GEN11_STATE_CACHE_REDIRECT_TO_CS (1 << 11)#define GEN7_L3SQCREG1 _MMIO(0xB010)#define VLV_B0_WA_L3SQCREG1_VALUE 0x00D30000
drivers/gpu/drm/i915/intel_engine_cs.c +4 -0
@@ -1513,6 +1513,10 @@ static int icl_init_workarounds(struct intel_engine_cs *engine)WA_SET_BIT_MASKED (GEN7_ROW_CHICKEN2 ,GEN11_TDL_CLOCK_GATING_FIX_DISABLE ); +/* WaEnableStateCacheRedirectToCS:icl */ +WA_SET_BIT_MASKED (GEN9_SLICE_COMMON_ECO_CHICKEN1 , +GEN11_STATE_CACHE_REDIRECT_TO_CS ); +/* WaSendPushConstantsFromMMIO:icl */ ret =wa_ring_whitelist_reg (engine,COMMON_SLICE_CHICKEN2 );if (ret)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 14/14 drm/i915/icl: Enable Sampler DFR
In reply to Oscar MateoSampler Dynamic Frequency Rebalancing (DFR) aims to reduce Sampler power by dynamically changing its clock frequency in low-throughput conditions. This patches enables it by default on Gen11.
v2: Wrong operation to clear the bit (Praveen)
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 4 ++++ 2 files changed, 7 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -8220,6 +8220,9 @@ enum {#define GAMW_ECO_DEV_RW_IA_REG _MMIO(0x4080)#define GAMW_ECO_DEV_CTX_RELOAD_DISABLE (1 << 7) +#define GEN10_DFR_RATIO_EN_AND_CHICKEN _MMIO(0x9550) +#define DFR_DISABLE (1 << 9) +#define TR_VA_TTL3_PTR_DW0 _MMIO(0x4DE0)#define TR_VA_TTL3_PTR_DW1 _MMIO(0x4DE4)
drivers/gpu/drm/i915/intel_pm.c +4 -0
@@ -8505,6 +8505,10 @@ static void icl_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (_3D_CHICKEN3,_MASKED_BIT_ENABLE (_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE)); +/* This is not an Wa. Enable to reduce Sampler power */ +I915_WRITE (GEN10_DFR_RATIO_EN_AND_CHICKEN , + (I915_READ (GEN10_DFR_RATIO_EN_AND_CHICKEN ) & ~DFR_DISABLE )); +/* WaInPlaceDecompressionHang:icl */ I915_WRITE (GEN9_GAMT_ECO_REG_RW_IA , (I915_READ (GEN9_GAMT_ECO_REG_RW_IA ) |GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS ));
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for series starting with [01/14] drm/i915/icl: Introduce initial Icelake Workarounds
In reply to Oscar Mateo== Series Details ==
== Series Details ==
Series: series starting with [01/14] drm/i915/icl: Introduce initial Icelake Workarounds
URL : https://patchwork.freedesktop.org/series/41247/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 0dbd53fd7f8c drm/i915/icl: Introduce initial Icelake Workarounds -:6: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #6: Inherit workarounds from previous platforms that are still valid for Icelake.
-:37: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'dev_priv' - possible side-effects? #37: FILE: drivers/gpu/drm/i915/i915_drv.h:2467:
+#define IS_ICL_REVID(dev_priv, since, until) \
+ (IS_ICELAKE(dev_priv) && IS_REVID(dev_priv, since, until))
total: 0 errors, 1 warnings, 1 checks, 112 lines checked 0070d9f6a54e drm/i915/icl: WaGAPZPriorityScheme 612cf4f0cfa9 drm/i915/icl: WaModifyGamTlbPartitioning d557f2334dca drm/i915/icl: WaL3BankAddressHashing 82b0e05d8d4c drm/i915/icl: WaDisableCleanEvicts
-:23: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #23: FILE: drivers/gpu/drm/i915/i915_reg.h:7181:
+#define GEN11_LQSC_CLEAN_EVICT_DISABLE (1<<6)
^
total: 0 errors, 0 warnings, 1 checks, 19 lines checked 1f0de8d1cf64 drm/i915/icl: WaDisableImprovedTdlClkGating -:25: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #25: FILE: drivers/gpu/drm/i915/i915_reg.h:8254:
+#define GEN11_TDL_CLOCK_GATING_FIX_DISABLE (1<<1)
^
total: 0 errors, 0 warnings, 1 checks, 20 lines checked8f02830b2c95 drm/i915/icl: WaCL2SFHalfMaxAlloc
-:6: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #6:
This workarounds an issue with insufficient storage for the CL2 and SF units.
total: 0 errors, 1 warnings, 0 checks, 23 lines checked 0fa4530e8474 drm/i915/icl: WaDisCtxReload 1ae846bffbf6 drm/i915/icl: WaSendPushConstantsFromMMIO 5fe0770ab25c drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken2 dd4eb78cd9d2 drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7 09f56bc1d1b4 drm/i915/icl: WaAllowUmdWriteTRTTRootTable 7ec11968e4ba drm/i915/icl: WaEnableStateCacheRedirectToCS c8c87325e876 drm/i915/icl: Enable Sampler DFR
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for series starting with [01/14] drm/i915/icl: Introduce initial Icelake Workarounds
In reply to Oscar Mateo== Series Details ==
== Series Details ==
Series: series starting with [01/14] drm/i915/icl: Introduce initial Icelake Workarounds
URL : https://patchwork.freedesktop.org/series/41247/
State : warning
== Summary ==
Series 41247v1 series starting with [01/14] drm/i915/icl: Introduce initial Icelake Workarounds
https://patchwork.freedesktop.org/api/1.0/series/41247/revisions/1/mbox/
---- Possible new issues:
Test gem_exec_gttfill:
Subgroup basic:
pass -> SKIP (fi-pnv-d510)---- Known issues:
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
pass -> FAIL (fi-gdg-551) fdo#102575
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
dmesg-warn -> PASS (fi-cnl-y3) fdo#104951
Subgroup suspend-read-crc-pipe-c:
pass -> INCOMPLETE (fi-bxt-dsi) fdo#103927
Test prime_vgem:
Subgroup basic-fence-flip:
fail -> PASS (fi-ilk-650) fdo#104008fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fi-bdw-5557u total:285 pass:264 dwarn:0 dfail:0 fail:0 skip:21 time:440s fi-bdw-gvtdvm total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:447s fi-blb-e6850 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:380s fi-bsw-n3050 total:285 pass:239 dwarn:0 dfail:0 fail:0 skip:46 time:543s fi-bwr-2160 total:285 pass:180 dwarn:0 dfail:0 fail:0 skip:105 time:299s fi-bxt-dsi total:243 pass:216 dwarn:0 dfail:0 fail:0 skip:26 fi-bxt-j4205 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:511s fi-byt-j1900 total:285 pass:250 dwarn:0 dfail:0 fail:0 skip:35 time:521s fi-byt-n2820 total:285 pass:246 dwarn:0 dfail:0 fail:0 skip:39 time:509s fi-cfl-8700k total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:413s fi-cfl-s3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:562s fi-cfl-u total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:510s fi-cnl-y3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:584s fi-elk-e7500 total:285 pass:226 dwarn:0 dfail:0 fail:0 skip:59 time:427s fi-gdg-551 total:285 pass:176 dwarn:0 dfail:0 fail:1 skip:108 time:318s fi-glk-1 total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:537s fi-glk-j4005 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:487s fi-hsw-4770 total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:405s fi-ilk-650 total:285 pass:225 dwarn:0 dfail:0 fail:0 skip:60 time:423s fi-ivb-3520m total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:470s fi-ivb-3770 total:285 pass:252 dwarn:0 dfail:0 fail:0 skip:33 time:430s fi-kbl-7500u total:285 pass:260 dwarn:1 dfail:0 fail:0 skip:24 time:473s fi-kbl-7567u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:464s fi-kbl-r total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:511s fi-pnv-d510 total:285 pass:219 dwarn:1 dfail:0 fail:0 skip:65 time:639s fi-skl-6260u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:443s fi-skl-6600u total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:534s fi-skl-6700k2 total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:505s fi-skl-6770hq total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:495s fi-skl-guc total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:431s fi-skl-gvtdvm total:285 pass:262 dwarn:0 dfail:0 fail:0 skip:23 time:442s fi-snb-2520m total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:583s fi-snb-2600 total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:410s
Blacklisted hosts:
fi-cnl-psr total:285 pass:256 dwarn:3 dfail:0 fail:0 skip:26 time:523s
fcaf73c13c14d6bfd64c4f37089bf5437fb32221 drm-tip: 2018y-04m-05d-15h-53m-18s UTC integration manifest c8c87325e876 drm/i915/icl: Enable Sampler DFR7ec11968e4ba drm/i915/icl: WaEnableStateCacheRedirectToCS09f56bc1d1b4 drm/i915/icl: WaAllowUmdWriteTRTTRootTabledd4eb78cd9d2 drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken75fe0770ab25c drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken21ae846bffbf6 drm/i915/icl: WaSendPushConstantsFromMMIO0fa4530e8474 drm/i915/icl: WaDisCtxReload8f02830b2c95 drm/i915/icl: WaCL2SFHalfMaxAlloc1f0de8d1cf64 drm/i915/icl: WaDisableImprovedTdlClkGating82b0e05d8d4c drm/i915/icl: WaDisableCleanEvictsd557f2334dca drm/i915/icl: WaL3BankAddressHashing612cf4f0cfa9 drm/i915/icl: WaModifyGamTlbPartitioning0070d9f6a54e drm/i915/icl: WaGAPZPriorityScheme0dbd53fd7f8c drm/i915/icl: Introduce initial Icelake Workarounds
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8610/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx