* [PATCH] drm/i915/tgl: Make Wa_14010229206 permanent
@ 2020-06-18 20:27 Rodrigo Vivi
2020-06-19 8:09 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Rodrigo Vivi @ 2020-06-18 20:27 UTC (permalink / raw)
To: stable
Cc: intel-gfx, Swathi Dhanavanthri, Rafael Antognolli, Matt Roper,
Rodrigo Vivi
From: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>
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@intel.com>
Tested-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
[mattrope: added missing blank line]
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200326234955.16155-1-swathi.dhanavanthri@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/gt/intel_workarounds.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915/tgl: Make Wa_14010229206 permanent
2020-06-18 20:27 [PATCH] drm/i915/tgl: Make Wa_14010229206 permanent Rodrigo Vivi
@ 2020-06-19 8:09 ` Greg KH
2020-06-19 20:14 ` Rodrigo Vivi
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2020-06-19 8:09 UTC (permalink / raw)
To: Rodrigo Vivi
Cc: stable, intel-gfx, Swathi Dhanavanthri, Rafael Antognolli,
Matt Roper
On Thu, Jun 18, 2020 at 01:27:00PM -0700, Rodrigo Vivi wrote:
> From: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>
>
> 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@intel.com>
> Tested-by: Rafael Antognolli <rafael.antognolli@intel.com>
> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> [mattrope: added missing blank line]
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> Link: https://patchwork.freedesktop.org/patch/msgid/20200326234955.16155-1-swathi.dhanavanthri@intel.com
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915/tgl: Make Wa_14010229206 permanent
2020-06-19 8:09 ` Greg KH
@ 2020-06-19 20:14 ` Rodrigo Vivi
2020-06-23 11:54 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Rodrigo Vivi @ 2020-06-19 20:14 UTC (permalink / raw)
To: Greg KH
Cc: stable, intel-gfx, Swathi Dhanavanthri, Rafael Antognolli,
Matt Roper
On Fri, Jun 19, 2020 at 10:09:00AM +0200, Greg KH wrote:
> On Thu, Jun 18, 2020 at 01:27:00PM -0700, Rodrigo Vivi wrote:
> > From: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>
> >
> > 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@intel.com>
> > Tested-by: Rafael Antognolli <rafael.antognolli@intel.com>
> > Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> > [mattrope: added missing blank line]
> > Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> > Link: https://patchwork.freedesktop.org/patch/msgid/20200326234955.16155-1-swathi.dhanavanthri@intel.com
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > 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
> :)
It's for 5.7.y only. Sorry for not being clear
>
> 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
> >
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915/tgl: Make Wa_14010229206 permanent
2020-06-19 20:14 ` Rodrigo Vivi
@ 2020-06-23 11:54 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2020-06-23 11:54 UTC (permalink / raw)
To: Rodrigo Vivi
Cc: stable, intel-gfx, Swathi Dhanavanthri, Rafael Antognolli,
Matt Roper
On Fri, Jun 19, 2020 at 01:14:04PM -0700, Rodrigo Vivi wrote:
> On Fri, Jun 19, 2020 at 10:09:00AM +0200, Greg KH wrote:
> > On Thu, Jun 18, 2020 at 01:27:00PM -0700, Rodrigo Vivi wrote:
> > > From: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>
> > >
> > > 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@intel.com>
> > > Tested-by: Rafael Antognolli <rafael.antognolli@intel.com>
> > > Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> > > [mattrope: added missing blank line]
> > > Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> > > Link: https://patchwork.freedesktop.org/patch/msgid/20200326234955.16155-1-swathi.dhanavanthri@intel.com
> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > ---
> > > 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
> > :)
>
> It's for 5.7.y only. Sorry for not being clear
Thanks, now queued up.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-23 11:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-18 20:27 [PATCH] drm/i915/tgl: Make Wa_14010229206 permanent Rodrigo Vivi
2020-06-19 8:09 ` Greg KH
2020-06-19 20:14 ` Rodrigo Vivi
2020-06-23 11:54 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).