| Message ID | 20191113191840.23620-1-radhakrishna.sripada@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm/i915/tgl: Wa_1606679103 | expand |
Quoting Radhakrishna Sripada (2019-11-13 19:18:39) > Extend disabling SAMPLER_STATE prefetch workaround to gen12. > > BSpec: 52890 > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_workarounds.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index e4bccc14602f..6818d6b3cc90 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -1370,11 +1370,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) > GEN7_SARCHKMD, > GEN7_DISABLE_DEMAND_PREFETCH); > > - /* Wa_1606682166:icl */ > - wa_write_or(wal, > - GEN7_SARCHKMD, > - GEN7_DISABLE_SAMPLER_PREFETCH); > - > /* Wa_1409178092:icl */ > wa_write_masked_or(wal, > GEN11_SCRATCH2, > @@ -1382,6 +1377,13 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) > 0); > } > > + if (IS_GEN_RANGE(i915, 11, 12)) { > + /* Wa_1606682166:icl,tgl */ Wa_1606679103:tgl as they insist on giving it a new id. But this is explicitly A0 only, so IS_TGL_REVID(A0, A0). -Chris
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index e4bccc14602f..6818d6b3cc90 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -1370,11 +1370,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) GEN7_SARCHKMD, GEN7_DISABLE_DEMAND_PREFETCH); - /* Wa_1606682166:icl */ - wa_write_or(wal, - GEN7_SARCHKMD, - GEN7_DISABLE_SAMPLER_PREFETCH); - /* Wa_1409178092:icl */ wa_write_masked_or(wal, GEN11_SCRATCH2, @@ -1382,6 +1377,13 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) 0); } + if (IS_GEN_RANGE(i915, 11, 12)) { + /* Wa_1606682166:icl,tgl */ + wa_write_or(wal, + GEN7_SARCHKMD, + GEN7_DISABLE_SAMPLER_PREFETCH); + } + if (IS_GEN_RANGE(i915, 9, 11)) { /* FtrPerCtxtPreemptionGranularityControl:skl,bxt,kbl,cfl,cnl,icl */ wa_masked_en(wal,
Extend disabling SAMPLER_STATE prefetch workaround to gen12. BSpec: 52890 Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> --- drivers/gpu/drm/i915/gt/intel_workarounds.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)