Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8cade59 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Show instdone for each engine in debugfs 



Although polling each engine quickly is preferable as it should give us
a sample of each engine at roughly the same time, keep it simple and
just sample the engine as print out the debug state.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190704200455.14870-3-chris@chris-wilson.co.uk
parent 8f856c74

drivers/gpu/drm/i915/i915_debugfs.c

+13 −20
Original line number Diff line number Diff line
@@ -1076,8 +1076,6 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused) 
{

	struct drm_i915_private *dev_priv = node_to_i915(m->private);

	struct intel_engine_cs *engine;

	u64 acthd[I915_NUM_ENGINES];

	struct intel_instdone instdone;

	intel_wakeref_t wakeref;

	enum intel_engine_id id;
@@ -1092,13 +1090,6 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused) 
		return 0;

	}



	with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref) {

		for_each_engine(engine, dev_priv, id)

			acthd[id] = intel_engine_get_active_head(engine);



		intel_engine_get_instdone(dev_priv->engine[RCS0], &instdone);

	}



	if (timer_pending(&dev_priv->gpu_error.hangcheck_work.timer))

		seq_printf(m, "Hangcheck active, timer fires in %dms\n",

			   jiffies_to_msecs(dev_priv->gpu_error.hangcheck_work.timer.expires -
@@ -1110,7 +1101,10 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused) 


	seq_printf(m, "GT active? %s\n", yesno(dev_priv->gt.awake));



	with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref) {

		for_each_engine(engine, dev_priv, id) {

			struct intel_instdone instdone;



			seq_printf(m, "%s: %d ms ago\n",

				   engine->name,

				   jiffies_to_msecs(jiffies -
@@ -1118,15 +1112,14 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused) 


			seq_printf(m, "\tACTHD = 0x%08llx [current 0x%08llx]\n",

				   (long long)engine->hangcheck.acthd,

			   (long long)acthd[id]);

				   intel_engine_get_active_head(engine));



		if (engine->id == RCS0) {

			seq_puts(m, "\tinstdone read =\n");

			intel_engine_get_instdone(engine, &instdone);



			seq_puts(m, "\tinstdone read =\n");

			i915_instdone_info(dev_priv, m, &instdone);



			seq_puts(m, "\tinstdone accu =\n");



			i915_instdone_info(dev_priv, m,

					   &engine->hangcheck.instdone);

		}