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

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

[Daniel Vetter]

This goes back to

commit 362b8af7ad1d91266aa4931e62be45c1e5cf753b
Author: Ben Widawsky <benjamin.widawsky@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@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@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)
 {
+	struct drm_i915_error_ring *ring = &error->ring[ring_idx];
+
 	if (!ring->valid)
 		return;
 
+	err_printf(m, "%s command stream:\n", ring_str(ring_idx));
 	err_printf(m, "  HEAD: 0x%08x\n", ring->head);
 	err_printf(m, "  TAIL: 0x%08x\n", ring->tail);
 	err_printf(m, "  CTL: 0x%08x\n", ring->ctl);
@@ -388,10 +392,8 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
 	if (INTEL_INFO(dev)->gen == 7)
 		err_printf(m, "ERR_INT: 0x%08x\n", error->err_int);
 
-	for (i = 0; i < ARRAY_SIZE(error->ring); i++) {
-		err_printf(m, "%s command stream:\n", ring_str(i));
-		i915_ring_error_state(m, dev, &error->ring[i]);
-	}
+	for (i = 0; i < ARRAY_SIZE(error->ring); i++)
+		i915_ring_error_state(m, dev, error, i);
 
 	for (i = 0; i < error->vm_count; i++) {
 		err_printf(m, "vm[%d]\n", i);
-- 
2.1.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Chris Wilson]

On Tue, Nov 18, 2014 at 01:28:38PM +0100, Daniel Vetter wrote:
> This goes back to
> 
> commit 362b8af7ad1d91266aa4931e62be45c1e5cf753b
> Author: Ben Widawsky <benjamin.widawsky@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@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vetter@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).
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Daniel Vetter]

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@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@intel.com>
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Signed-off-by: Daniel Vetter <daniel.vetter@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.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [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@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@intel.com>
> > > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > > Signed-off-by: Daniel Vetter <daniel.vetter@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@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Don't print header in error state for

[shuang.he]

Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
-------------------------------------Summary-------------------------------------
Platform: baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=290/290->290/290
PNV: pass/total=362/362->362/362
ILK: pass/total=381/381->376/381
IVB: pass/total=522/559->522/559
SNB: pass/total=444/444->444/444
HSW: pass/total=525/525->523/525
BDW: pass/total=436/436->436/436
-------------------------------------Detailed-------------------------------------
test_platform: test_suite, test_case, result_with_drm_intel_nightly(count, machine_id...)...->result_with_patch_applied(count, machine_id)...
ILK: Intel_gpu_tools, igt_kms_flip_absolute-wf_vblank, DMESG_WARN(1, M26)PASS(3, M37M26) -> DMESG_WARN(4, M26)
ILK: Intel_gpu_tools, igt_kms_flip_blocking-absolute-wf_vblank-interruptible, DMESG_WARN(2, M26)PASS(2, M6M26) -> DMESG_WARN(2, M26)PASS(2, M26)
ILK: Intel_gpu_tools, igt_kms_flip_flip-vs-modeset-vs-hang, DMESG_WARN(2, M26)PASS(2, M37M26) -> DMESG_WARN(2, M26)PASS(2, M26)
ILK: Intel_gpu_tools, igt_kms_flip_plain-flip, DMESG_WARN(1, M26)PASS(6, M37M26) -> DMESG_WARN(1, M26)PASS(3, M26)
ILK: Intel_gpu_tools, igt_kms_flip_wf_vblank-ts-check, DMESG_WARN(1, M26)PASS(6, M37M26) -> DMESG_WARN(2, M26)PASS(2, M26)
HSW: Intel_gpu_tools, igt_gem_reset_stats_close-pending-fork-reverse-render, PASS(4, M19M20) -> NO_RESULT(1, M20)PASS(3, M20)
HSW: Intel_gpu_tools, igt_gem_reset_stats_reset-count-vebox, PASS(4, M19M20) -> NO_RESULT(1, M20)PASS(3, M20)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx