On pre-production hardware workload that uses push constant could cause FIFO overflow and a hang. Disable the push constant buffer in TDL to workaround. Bspec: 46047 Bspec: 52890 Cc: Jordan Justen <jordan.l.justen@xxxxxxxxx> Cc: Aditya Swarup <aditya.swarup@xxxxxxxxx> Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@xxxxxxxxx> --- drivers/gpu/drm/i915/gt/intel_workarounds.c | 8 +++++++- drivers/gpu/drm/i915/i915_reg.h | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 4e292d4bf7b9..b6fc861a8b59 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -576,6 +576,7 @@ static void tgl_ctx_workarounds_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) { u32 val; + struct drm_i915_private *i915 = engine->i915; /* Wa_1409142259:tgl */ WA_SET_BIT_MASKED(GEN11_COMMON_SLICE_CHICKEN3, @@ -591,8 +592,13 @@ static void tgl_ctx_workarounds_init(struct intel_engine_cs *engine, * the read of FF_MODE2. */ wa_add(wal, FF_MODE2, FF_MODE2_TDS_TIMER_MASK, val, - IS_TGL_REVID(engine->i915, TGL_REVID_A0, TGL_REVID_A0) ? 0 : + IS_TGL_REVID(i915, TGL_REVID_A0, TGL_REVID_A0) ? 0 : FF_MODE2_TDS_TIMER_MASK); + + /* Wa_1409085225:tgl (pre-prod) */ + if (IS_TGL_REVID(i915, TGL_REVID_A0, TGL_REVID_A0)) + WA_SET_BIT_MASKED(GEN9_ROW_CHICKEN4, + GEN12_DISABLE_TDL_PUSH_CONSTANT); } static void diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 6cc55c103f67..49d8407c079a 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -9141,6 +9141,9 @@ enum { #define PUSH_CONSTANT_DEREF_DISABLE (1 << 8) #define GEN11_TDL_CLOCK_GATING_FIX_DISABLE (1 << 1) +#define GEN9_ROW_CHICKEN4 _MMIO(0xe48c) +#define GEN12_DISABLE_TDL_PUSH_CONSTANT REG_BIT(9) + #define HSW_ROW_CHICKEN3 _MMIO(0xe49c) #define HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE (1 << 6) -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx