[Intel-gfx] [PATCH 1/2] drm/i915: Consolidate reset-request debug message

[Chris Wilson]

Quoting Mika Kuoppala (2019-03-12 12:23:15)
> Chris Wilson <chris at chris-wilson.co.uk> writes:
> 
> > Move the pair of messages to the common callsite where it makes sense to
> > include a bit more information about which request is being reset.
> >
> > Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> > Cc: Mika Kuoppala <mika.kuoppala at intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_reset.c       | 6 ++++++
> >  drivers/gpu/drm/i915/intel_lrc.c        | 1 -
> >  drivers/gpu/drm/i915/intel_ringbuffer.c | 2 --
> >  3 files changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_reset.c b/drivers/gpu/drm/i915/i915_reset.c
> > index 3fbaa72a9eac..3c08e08837d0 100644
> > --- a/drivers/gpu/drm/i915/i915_reset.c
> > +++ b/drivers/gpu/drm/i915/i915_reset.c
> > @@ -98,6 +98,12 @@ static void context_mark_innocent(struct i915_gem_context *ctx)
> >  
> >  void i915_reset_request(struct i915_request *rq, bool guilty)
> >  {
> > +     GEM_TRACE("%s rq=%llx:%lld, guilty? %s\n",
> > +               rq->engine->name,
> > +               rq->fence.context,
> > +               rq->fence.seqno,
> > +               yesno(guilty));
> > +
> >       lockdep_assert_held(&rq->engine->timeline.lock);
> >       GEM_BUG_ON(i915_request_completed(rq));
> >  
> > diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> > index 748352d513d6..dc3de09c7586 100644
> > --- a/drivers/gpu/drm/i915/intel_lrc.c
> > +++ b/drivers/gpu/drm/i915/intel_lrc.c
> > @@ -1957,7 +1957,6 @@ static void execlists_reset(struct intel_engine_cs *engine, bool stalled)
> >       /* Following the reset, we need to reload the CSB read/write pointers */
> >       reset_csb_pointers(&engine->execlists);
> >  
> > -     GEM_TRACE("%s stalled? %s\n", engine->name, yesno(stalled));
> 
> You will lose a trace in this spot if no request can be found.
> Looks of it, still redundant as we get that from prior traces.

Yes, in fact it was more informative by its absence!
-Chris