* [PATCH 1/2] drm/i915: Add is-wedged flag to intel_engine_dump()
@ 2017-10-27 17:36 Chris Wilson
2017-10-27 17:36 ` [PATCH 2/2] drm/i915: Include the global reset count for intel_engine_dump() Chris Wilson
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chris Wilson @ 2017-10-27 17:36 UTC (permalink / raw)
To: intel-gfx
Comparing the state tested by intel_engine_is_idle() and printed by
intel_engine_dump(), the only bit not shown is whether or not the device
is wedged. Add that little bit of information to the pretty printer so
that if the engine fails to idle we can see why.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_engine_cs.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 6895a90af008..a8ea27bea171 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1693,7 +1693,9 @@ void intel_engine_dump(struct intel_engine_cs *engine, struct drm_printer *m)
struct rb_node *rb;
u64 addr;
- drm_printf(m, "%s\n", engine->name);
+ drm_printf(m, "%s%s\n", engine->name,
+ i915_terminally_wedged(&engine->i915->gpu_error) ?
+ " (wedged)" : "");
drm_printf(m, "\tcurrent seqno %x, last %x, hangcheck %x [%d ms], inflight %d\n",
intel_engine_get_seqno(engine),
intel_engine_last_submit(engine),
--
2.15.0.rc2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] drm/i915: Include the global reset count for intel_engine_dump()
2017-10-27 17:36 [PATCH 1/2] drm/i915: Add is-wedged flag to intel_engine_dump() Chris Wilson
@ 2017-10-27 17:36 ` Chris Wilson
2017-10-30 11:55 ` Mika Kuoppala
2017-10-27 18:15 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Add is-wedged flag to intel_engine_dump() Patchwork
2017-10-30 11:43 ` [PATCH 1/2] " Mika Kuoppala
2 siblings, 1 reply; 5+ messages in thread
From: Chris Wilson @ 2017-10-27 17:36 UTC (permalink / raw)
To: intel-gfx
Since a global reset affects the engine, include that along side the
per-engine reset counter when pretty printing the engine state in
intel_engine_dump().
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index a8ea27bea171..6a06d74d70cc 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1702,8 +1702,9 @@ void intel_engine_dump(struct intel_engine_cs *engine, struct drm_printer *m)
engine->hangcheck.seqno,
jiffies_to_msecs(jiffies - engine->hangcheck.action_timestamp),
engine->timeline->inflight_seqnos);
- drm_printf(m, "\tReset count: %d\n",
- i915_reset_engine_count(error, engine));
+ drm_printf(m, "\tReset count: %d (global %d)\n",
+ i915_reset_engine_count(error, engine),
+ i915_reset_count(error));
rcu_read_lock();
--
2.15.0.rc2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/i915: Include the global reset count for intel_engine_dump()
2017-10-27 17:36 ` [PATCH 2/2] drm/i915: Include the global reset count for intel_engine_dump() Chris Wilson
@ 2017-10-30 11:55 ` Mika Kuoppala
0 siblings, 0 replies; 5+ messages in thread
From: Mika Kuoppala @ 2017-10-30 11:55 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Since a global reset affects the engine, include that along side the
> per-engine reset counter when pretty printing the engine state in
> intel_engine_dump().
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
> index a8ea27bea171..6a06d74d70cc 100644
> --- a/drivers/gpu/drm/i915/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> @@ -1702,8 +1702,9 @@ void intel_engine_dump(struct intel_engine_cs *engine, struct drm_printer *m)
> engine->hangcheck.seqno,
> jiffies_to_msecs(jiffies - engine->hangcheck.action_timestamp),
> engine->timeline->inflight_seqnos);
> - drm_printf(m, "\tReset count: %d\n",
> - i915_reset_engine_count(error, engine));
> + drm_printf(m, "\tReset count: %d (global %d)\n",
> + i915_reset_engine_count(error, engine),
> + i915_reset_count(error));
>
> rcu_read_lock();
>
> --
> 2.15.0.rc2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Add is-wedged flag to intel_engine_dump()
2017-10-27 17:36 [PATCH 1/2] drm/i915: Add is-wedged flag to intel_engine_dump() Chris Wilson
2017-10-27 17:36 ` [PATCH 2/2] drm/i915: Include the global reset count for intel_engine_dump() Chris Wilson
@ 2017-10-27 18:15 ` Patchwork
2017-10-30 11:43 ` [PATCH 1/2] " Mika Kuoppala
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2017-10-27 18:15 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915: Add is-wedged flag to intel_engine_dump()
URL : https://patchwork.freedesktop.org/series/32772/
State : failure
== Summary ==
Series 32772v1 series starting with [1/2] drm/i915: Add is-wedged flag to intel_engine_dump()
https://patchwork.freedesktop.org/api/1.0/series/32772/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-uc-set-default:
pass -> DMESG-FAIL (fi-glk-dsi)
Subgroup basic-wb-pro-default:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-wb-prw-default:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-wb-ro-before-default:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-wb-ro-default:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-wb-rw-before-default:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-wb-rw-default:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-wb-set-default:
pass -> SKIP (fi-glk-dsi)
Test gem_exec_nop:
Subgroup basic-parallel:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-series:
pass -> SKIP (fi-glk-dsi)
Test gem_exec_parallel:
Subgroup basic:
pass -> SKIP (fi-glk-dsi)
Test gem_exec_reloc:
Subgroup basic-cpu:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-gtt:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-cpu:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-read:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-read:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-cpu:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-gtt:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-read:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-gtt-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-cpu-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-read-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-read-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-cpu-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-gtt-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-read-noreloc:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-gtt-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-cpu-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-cpu-read-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-gtt-read-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-cpu-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-gtt-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-write-read-active:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-softpin:
pass -> SKIP (fi-glk-dsi)
Test gem_exec_store:
Subgroup basic-all:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-blt:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-bsd:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-default:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-render:
pass -> SKIP (fi-glk-dsi)
Subgroup basic-vebox:
pass -> SKIP (fi-glk-dsi)
Test gem_exec_suspend:
Subgroup basic:
WARNING: Long output truncated
4efa630855362c267af94785e50948bb60615bfe drm-tip: 2017y-10m-27d-15h-25m-04s UTC integration manifest
337c8d8f96f3 drm/i915: Include the global reset count for intel_engine_dump()
af67e1f28933 drm/i915: Add is-wedged flag to intel_engine_dump()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6244/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] drm/i915: Add is-wedged flag to intel_engine_dump()
2017-10-27 17:36 [PATCH 1/2] drm/i915: Add is-wedged flag to intel_engine_dump() Chris Wilson
2017-10-27 17:36 ` [PATCH 2/2] drm/i915: Include the global reset count for intel_engine_dump() Chris Wilson
2017-10-27 18:15 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Add is-wedged flag to intel_engine_dump() Patchwork
@ 2017-10-30 11:43 ` Mika Kuoppala
2 siblings, 0 replies; 5+ messages in thread
From: Mika Kuoppala @ 2017-10-30 11:43 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Comparing the state tested by intel_engine_is_idle() and printed by
> intel_engine_dump(), the only bit not shown is whether or not the device
> is wedged. Add that little bit of information to the pretty printer so
> that if the engine fails to idle we can see why.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_engine_cs.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
> index 6895a90af008..a8ea27bea171 100644
> --- a/drivers/gpu/drm/i915/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> @@ -1693,7 +1693,9 @@ void intel_engine_dump(struct intel_engine_cs *engine, struct drm_printer *m)
> struct rb_node *rb;
> u64 addr;
>
> - drm_printf(m, "%s\n", engine->name);
> + drm_printf(m, "%s%s\n", engine->name,
> + i915_terminally_wedged(&engine->i915->gpu_error) ?
> + " (wedged)" : "");
> drm_printf(m, "\tcurrent seqno %x, last %x, hangcheck %x [%d ms], inflight %d\n",
> intel_engine_get_seqno(engine),
> intel_engine_last_submit(engine),
> --
> 2.15.0.rc2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-10-30 11:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-27 17:36 [PATCH 1/2] drm/i915: Add is-wedged flag to intel_engine_dump() Chris Wilson
2017-10-27 17:36 ` [PATCH 2/2] drm/i915: Include the global reset count for intel_engine_dump() Chris Wilson
2017-10-30 11:55 ` Mika Kuoppala
2017-10-27 18:15 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Add is-wedged flag to intel_engine_dump() Patchwork
2017-10-30 11:43 ` [PATCH 1/2] " Mika Kuoppala
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox