| Message ID | 20200915124150.12045-4-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] drm/i915/gt: Widen CSB pointer to u64 for the parsers | expand |
Chris Wilson <chris@chris-wilson.co.uk> writes: > If we find the GPU didn't update the CSB within 50us, we currently fail > and eventually reset the GPU. Lets report the value from the mmio space > as a last resort, it may just stave off an unnecessary GPU reset. > > Suggested-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> I am more of a messenger. This can be replaced by References: HSDES#22011327657 > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/gt/intel_lrc.c | 26 +++++++++++++++++++------ > drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 3 +++ > 2 files changed, 23 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c > index fcb6ec3d55f4..7cf208311539 100644 > --- a/drivers/gpu/drm/i915/gt/intel_lrc.c > +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c > @@ -2528,19 +2528,33 @@ static inline bool gen8_csb_parse(const u64 csb) > return csb & (GEN8_CTX_STATUS_IDLE_ACTIVE | GEN8_CTX_STATUS_PREEMPTED); > } > > -static noinline u64 wa_csb_read(u64 * const csb) > +static noinline u64 > +wa_csb_read(const struct intel_engine_cs *engine, u64 * const csb) > { > u64 entry; > > preempt_disable(); > - if (wait_for_atomic_us((entry = READ_ONCE(*csb)) != -1, 50)) > - GEM_WARN_ON("50us CSB timeout"); > + if (wait_for_atomic_us((entry = READ_ONCE(*csb)) != -1, 50)) { The hsdes says 30us delay between head and csb fetch. But well we want to sort it out as quickly as possible. hsdes also states that status buf read delay OR mmio read. I think that our AND variation surpasses the recommendations. Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > + int idx = csb - engine->execlists.csb_status; > + int status; > + > + status = GEN8_EXECLISTS_STATUS_BUF; > + if (idx >= 6) { > + status = GEN11_EXECLISTS_STATUS_BUF2; > + idx -= 6; > + } > + status += sizeof(u64) * idx; > + > + entry = intel_uncore_read64(engine->uncore, > + _MMIO(engine->mmio_base + status)); > + } > preempt_enable(); > > return entry; > } > > -static inline u64 csb_read(u64 * const csb) > +static inline u64 > +csb_read(const struct intel_engine_cs *engine, u64 * const csb) > { > u64 entry = READ_ONCE(*csb); > > @@ -2556,7 +2570,7 @@ static inline u64 csb_read(u64 * const csb) > * tgl:HSDES#22011248461 > */ > if (unlikely(entry == -1)) > - entry = wa_csb_read(csb); > + entry = wa_csb_read(engine, csb); > > /* Consume this entry so that we can spot its future reuse. */ > WRITE_ONCE(*csb, -1); > @@ -2649,7 +2663,7 @@ static void process_csb(struct intel_engine_cs *engine) > * status notifier. > */ > > - csb = csb_read(buf + head); > + csb = csb_read(engine, buf + head); > ENGINE_TRACE(engine, "csb[%d]: status=0x%08x:0x%08x\n", > head, upper_32_bits(csb), lower_32_bits(csb)); > > diff --git a/drivers/gpu/drm/i915/gt/intel_lrc_reg.h b/drivers/gpu/drm/i915/gt/intel_lrc_reg.h > index 93cb6c460508..1b51f7b9a5c3 100644 > --- a/drivers/gpu/drm/i915/gt/intel_lrc_reg.h > +++ b/drivers/gpu/drm/i915/gt/intel_lrc_reg.h > @@ -49,4 +49,7 @@ > #define GEN11_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x1A > #define GEN12_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0xD > > +#define GEN8_EXECLISTS_STATUS_BUF 0x370 > +#define GEN11_EXECLISTS_STATUS_BUF2 0x3c0 > + > #endif /* _INTEL_LRC_REG_H_ */ > -- > 2.20.1
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index fcb6ec3d55f4..7cf208311539 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -2528,19 +2528,33 @@ static inline bool gen8_csb_parse(const u64 csb) return csb & (GEN8_CTX_STATUS_IDLE_ACTIVE | GEN8_CTX_STATUS_PREEMPTED); } -static noinline u64 wa_csb_read(u64 * const csb) +static noinline u64 +wa_csb_read(const struct intel_engine_cs *engine, u64 * const csb) { u64 entry; preempt_disable(); - if (wait_for_atomic_us((entry = READ_ONCE(*csb)) != -1, 50)) - GEM_WARN_ON("50us CSB timeout"); + if (wait_for_atomic_us((entry = READ_ONCE(*csb)) != -1, 50)) { + int idx = csb - engine->execlists.csb_status; + int status; + + status = GEN8_EXECLISTS_STATUS_BUF; + if (idx >= 6) { + status = GEN11_EXECLISTS_STATUS_BUF2; + idx -= 6; + } + status += sizeof(u64) * idx; + + entry = intel_uncore_read64(engine->uncore, + _MMIO(engine->mmio_base + status)); + } preempt_enable(); return entry; } -static inline u64 csb_read(u64 * const csb) +static inline u64 +csb_read(const struct intel_engine_cs *engine, u64 * const csb) { u64 entry = READ_ONCE(*csb); @@ -2556,7 +2570,7 @@ static inline u64 csb_read(u64 * const csb) * tgl:HSDES#22011248461 */ if (unlikely(entry == -1)) - entry = wa_csb_read(csb); + entry = wa_csb_read(engine, csb); /* Consume this entry so that we can spot its future reuse. */ WRITE_ONCE(*csb, -1); @@ -2649,7 +2663,7 @@ static void process_csb(struct intel_engine_cs *engine) * status notifier. */ - csb = csb_read(buf + head); + csb = csb_read(engine, buf + head); ENGINE_TRACE(engine, "csb[%d]: status=0x%08x:0x%08x\n", head, upper_32_bits(csb), lower_32_bits(csb)); diff --git a/drivers/gpu/drm/i915/gt/intel_lrc_reg.h b/drivers/gpu/drm/i915/gt/intel_lrc_reg.h index 93cb6c460508..1b51f7b9a5c3 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc_reg.h +++ b/drivers/gpu/drm/i915/gt/intel_lrc_reg.h @@ -49,4 +49,7 @@ #define GEN11_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x1A #define GEN12_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0xD +#define GEN8_EXECLISTS_STATUS_BUF 0x370 +#define GEN11_EXECLISTS_STATUS_BUF2 0x3c0 + #endif /* _INTEL_LRC_REG_H_ */
If we find the GPU didn't update the CSB within 50us, we currently fail and eventually reset the GPU. Lets report the value from the mmio space as a last resort, it may just stave off an unnecessary GPU reset. Suggested-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> --- drivers/gpu/drm/i915/gt/intel_lrc.c | 26 +++++++++++++++++++------ drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 3 +++ 2 files changed, 23 insertions(+), 6 deletions(-)