From: Michel Thierry <michel.thierry@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 08/10] drm/i915/tdr: Export per-engine reset count info to debugfs
Date: Wed, 11 Jan 2017 20:18:15 -0800 [thread overview]
Message-ID: <20170112041817.1102-9-michel.thierry@intel.com> (raw)
In-Reply-To: <20170112041817.1102-1-michel.thierry@intel.com>
From: Arun Siluvery <arun.siluvery@linux.intel.com>
A new variable is added to export the reset counts to debugfs, this
includes full gpu reset and engine reset count. This is useful for tests
where they are expected to trigger reset; these counts are checked before
and after the test to ensure the same.
v2: Include reset engine count in i915_engine_info too (Chris).
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 9d7b5a8c8dea..424d3ba8cab6 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1360,6 +1360,23 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)
return 0;
}
+static int i915_reset_info(struct seq_file *m, void *unused)
+{
+ struct drm_i915_private *dev_priv = node_to_i915(m->private);
+ struct i915_gpu_error *error = &dev_priv->gpu_error;
+ struct intel_engine_cs *engine;
+ enum intel_engine_id id;
+
+ seq_printf(m, "full gpu reset = %u\n", i915_reset_count(error));
+
+ for_each_engine(engine, dev_priv, id) {
+ seq_printf(m, "%s = %u\n", engine->name,
+ i915_reset_engine_count(error, engine));
+ }
+
+ return 0;
+}
+
static int ironlake_drpc_info(struct seq_file *m)
{
struct drm_i915_private *dev_priv = node_to_i915(m->private);
@@ -3140,6 +3157,7 @@ static int i915_display_info(struct seq_file *m, void *unused)
static int i915_engine_info(struct seq_file *m, void *unused)
{
struct drm_i915_private *dev_priv = node_to_i915(m->private);
+ struct i915_gpu_error *error = &dev_priv->gpu_error;
struct intel_engine_cs *engine;
enum intel_engine_id id;
@@ -3157,6 +3175,8 @@ static int i915_engine_info(struct seq_file *m, void *unused)
intel_engine_last_submit(engine),
engine->hangcheck.seqno,
jiffies_to_msecs(jiffies - engine->hangcheck.action_timestamp));
+ seq_printf(m, "\tReset count: %d\n",
+ i915_reset_engine_count(error, engine));
rcu_read_lock();
@@ -4555,6 +4575,7 @@ static const struct drm_info_list i915_debugfs_list[] = {
{"i915_guc_log_dump", i915_guc_log_dump, 0},
{"i915_frequency_info", i915_frequency_info, 0},
{"i915_hangcheck_info", i915_hangcheck_info, 0},
+ {"i915_reset_info", i915_reset_info, 0},
{"i915_drpc_info", i915_drpc_info, 0},
{"i915_emon_status", i915_emon_status, 0},
{"i915_ring_freq_table", i915_ring_freq_table, 0},
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-01-12 4:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-12 4:18 [PATCH v4 00/10] Execlist based engine-reset (v4) Michel Thierry
2017-01-12 4:18 ` [PATCH 01/10] drm/i915: Keep i915_handle_error kerneldoc parameters together Michel Thierry
2017-01-12 4:18 ` [PATCH 02/10] drm/i915: Update i915_reset parameter for kerneldoc Michel Thierry
2017-01-12 14:12 ` Mika Kuoppala
2017-01-12 4:18 ` [PATCH 03/10] drm/i915: Update i915.reset to handle engine resets Michel Thierry
2017-01-12 12:22 ` Joonas Lahtinen
2017-01-12 13:11 ` Chris Wilson
2017-01-12 4:18 ` [PATCH 04/10] drm/i915/tdr: Modify error handler for per engine hang recovery Michel Thierry
2017-01-12 7:27 ` Chris Wilson
2017-01-12 4:18 ` [PATCH 05/10] drm/i915/tdr: Add support for per engine reset recovery Michel Thierry
2017-01-12 4:18 ` [PATCH 06/10] drm/i915: Skip reset request if there is one already Michel Thierry
2017-01-12 4:18 ` [PATCH 07/10] drm/i915/tdr: Add engine reset count to error state Michel Thierry
2017-01-12 4:18 ` Michel Thierry [this message]
2017-01-12 4:18 ` [PATCH 09/10] drm/i915/tdr: Enable Engine reset and recovery support Michel Thierry
2017-01-12 4:18 ` [PATCH 10/10] drm/i915: Add engine reset count in get-reset-stats ioctl Michel Thierry
2017-01-12 4:53 ` ✓ Fi.CI.BAT: success for Execlist based engine-reset (rev2) Patchwork
2017-01-12 7:30 ` [PATCH v4 00/10] Execlist based engine-reset (v4) Chris Wilson
2017-01-12 18:39 ` Michel Thierry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170112041817.1102-9-michel.thierry@intel.com \
--to=michel.thierry@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox