[Intel-gfx] [PATCH] drm/i915: Don't print header in error state for non-existing CS

[Chris Wilson]

On Tue, Nov 18, 2014 at 03:34:15PM +0100, Daniel Vetter wrote:
> On Tue, Nov 18, 2014 at 02:04:23PM +0000, Chris Wilson wrote:
> > On Tue, Nov 18, 2014 at 01:28:38PM +0100, Daniel Vetter wrote:
> > > This goes back to
> > > 
> > > commit 362b8af7ad1d91266aa4931e62be45c1e5cf753b
> > > Author: Ben Widawsky <benjamin.widawsky at intel.com>
> > > Date:   Thu Jan 30 00:19:38 2014 -0800
> > > 
> > >     drm/i915: Move per ring error state to ring_error
> > > 
> > > Spotted while reading error states.
> > > 
> > > Cc: Ben Widawsky <benjamin.widawsky at intel.com>
> > > Cc: Chris Wilson <chris at chris-wilson.co.uk>
> > > Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> > > ---
> > >  drivers/gpu/drm/i915/i915_gpu_error.c | 12 +++++++-----
> > >  1 file changed, 7 insertions(+), 5 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> > > index 89a2f3dbf956..82111b8ad374 100644
> > > --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> > > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> > > @@ -242,11 +242,15 @@ static const char *hangcheck_action_to_str(enum intel_ring_hangcheck_action a)
> > >  
> > >  static void i915_ring_error_state(struct drm_i915_error_state_buf *m,
> > >  				  struct drm_device *dev,
> > > -				  struct drm_i915_error_ring *ring)
> > > +				  struct drm_i915_error_state *error,
> > > +				  int ring_idx)
> > 
> > Hmm, doesn't the drm_i915_error_ring already have ring->id set? It does
> > in my kernel (and so saves having to pass in error + ring_idx).
> 
> Unfortunately not ... and I'm too lazily to rework things even more.

Oh well,
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre