[Intel-gfx] [PATCH 2/2] drm/i915: Display current hangcheck status in debugfs

[Chris Wilson]

On Fri, Jan 23, 2015 at 03:19:16PM +0200, Ville Syrjälä wrote:
> On Fri, Jan 23, 2015 at 02:44:08PM +0200, Mika Kuoppala wrote:
> > From: Chris Wilson <chris at chris-wilson.co.uk>
> > 
> > For example,
> > 
> > /sys/kernel/debug/dri/0/i915_hangcheck_info:
> > 
> > Hangcheck active, fires in 15887800ms
> > render ring:
> >         seqno = -4059 [current -583]
> >         action = 2
> >         score = 0
> >         ACTHD = 1ee8 [current 21f980]
> >         max ACTHD = 0
> > 
> > v2: Include expiration ETA. Can anyone spot a problem?
> > v3: Convert for workqueued hangcheck (Mika)
> > 
> > Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he at intel.com) (v2)
> > Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk> (v2)
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com> (v2)
> > Signed-off-by: Mika Kuoppala <mika.kuoppala at intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_debugfs.c | 36 ++++++++++++++++++++++++++++++++++++
> >  1 file changed, 36 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > index 2ad4c48..1502c96 100644
> > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > @@ -1219,6 +1219,41 @@ out:
> >  	return ret;
> >  }
> >  
> > +static int i915_hangcheck_info(struct seq_file *m, void *unused)
> > +{
> > +	struct drm_info_node *node = m->private;
> > +	struct drm_i915_private *dev_priv = to_i915(node->minor->dev);
> > +	struct intel_engine_cs *ring;
> > +	int i;
> > +
> > +	if (!i915.enable_hangcheck) {
> > +		seq_printf(m, "Hangcheck disabled\n");
> > +		return 0;
> > +	}
> > +
> > +	if (delayed_work_pending(&dev_priv->gpu_error.hangcheck_work)) {
> > +		seq_printf(m, "Hangcheck active, fires in %dms\n",
> > +			   jiffies_to_msecs(dev_priv->gpu_error.hangcheck_work.timer.expires -
> > +					    jiffies));
> > +	} else
> > +		seq_printf(m, "Hangcheck inactive\n");
> > +
> > +	for_each_ring(ring, dev_priv, i) {
> > +		seq_printf(m, "%s:\n", ring->name);
> > +		seq_printf(m, "\tseqno = %d [current %d]\n",
> 
> %u ?

%x. Then it will be more consistent with how we print it else. (No one
has ever accused me of being consistent!)
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre