On Thu, Jun 18, 2020 at 01:27:00PM -0700, Rodrigo Vivi wrote: > From: Swathi Dhanavanthri <swathi.dhanavanthri@xxxxxxxxx> > > commit 63d0f3ea8ebb67160eca281320d255c72b0cb51a upstream. > > This workaround now applies to all steppings, not just A0. > Wa_1409085225 is a temporary A0-only W/A however it is > identical to Wa_14010229206 and hence the combined workaround > is made permanent. > Bspec: 52890 > > Signed-off-by: Swathi Dhanavanthri <swathi.dhanavanthri@xxxxxxxxx> > Tested-by: Rafael Antognolli <rafael.antognolli@xxxxxxxxx> > Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx> > [mattrope: added missing blank line] > Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx> > Link: https://patchwork.freedesktop.org/patch/msgid/20200326234955.16155-1-swathi.dhanavanthri@xxxxxxxxx > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > --- > drivers/gpu/drm/i915/gt/intel_workarounds.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) What stable kernel(s) is this backport for? You need to give us a hint :) thanks, greg k-h > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index 5176ad1a3976..092a42367851 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -1379,12 +1379,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) > GEN7_FF_THREAD_MODE, > GEN12_FF_TESSELATION_DOP_GATE_DISABLE); > > - /* > - * Wa_1409085225:tgl > - * Wa_14010229206:tgl > - */ > - wa_masked_en(wal, GEN9_ROW_CHICKEN4, GEN12_DISABLE_TDL_PUSH); > - > /* Wa_1408615072:tgl */ > wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE2, > VSUNIT_CLKGATE_DIS_TGL); > @@ -1402,6 +1396,12 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) > wa_masked_en(wal, > GEN9_CS_DEBUG_MODE1, > FF_DOP_CLOCK_GATE_DISABLE); > + > + /* > + * Wa_1409085225:tgl > + * Wa_14010229206:tgl > + */ > + wa_masked_en(wal, GEN9_ROW_CHICKEN4, GEN12_DISABLE_TDL_PUSH); > } > > if (IS_GEN(i915, 11)) { > -- > 2.24.1 >
