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

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

drm/i915: Stop showing seqno info from debugfs/i915_interrupt_info 



Since the seqno information shown from i915_interrupt_info is just a
small subset of i915_engine_info, remove it.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171209104418.4223-2-chris@chris-wilson.co.uk
parent b9dfda56

drivers/gpu/drm/i915/i915_debugfs.c

+2 −22
Original line number Diff line number Diff line
@@ -664,25 +664,6 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data) 
	return 0;

}



static void i915_ring_seqno_info(struct seq_file *m,

				 struct intel_engine_cs *engine)

{

	struct intel_breadcrumbs *b = &engine->breadcrumbs;

	struct rb_node *rb;



	seq_printf(m, "Current sequence (%s): %x\n",

		   engine->name, intel_engine_get_seqno(engine));



	spin_lock_irq(&b->rb_lock);

	for (rb = rb_first(&b->waiters); rb; rb = rb_next(rb)) {

		struct intel_wait *w = rb_entry(rb, typeof(*w), node);



		seq_printf(m, "Waiting (%s): %s [%d] on %x\n",

			   engine->name, w->tsk->comm, w->tsk->pid, w->seqno);

	}

	spin_unlock_irq(&b->rb_lock);

}



static int i915_interrupt_info(struct seq_file *m, void *data)

{

	struct drm_i915_private *dev_priv = node_to_i915(m->private);
@@ -883,13 +864,12 @@ static int i915_interrupt_info(struct seq_file *m, void *data) 
		seq_printf(m, "Graphics Interrupt mask:		%08x\n",

			   I915_READ(GTIMR));

	}

	for_each_engine(engine, dev_priv, id) {

	if (INTEL_GEN(dev_priv) >= 6) {

		for_each_engine(engine, dev_priv, id) {

			seq_printf(m,

				   "Graphics Interrupt mask (%s):	%08x\n",

				   engine->name, I915_READ_IMR(engine));

		}

		i915_ring_seqno_info(m, engine);

	}

	intel_runtime_pm_put(dev_priv);

drivers/gpu/drm/i915/intel_engine_cs.c

+4 −0
Original line number Diff line number Diff line
@@ -1840,6 +1840,10 @@ void intel_engine_dump(struct intel_engine_cs *engine, 
	}

	spin_unlock_irq(&b->rb_lock);



	if (INTEL_GEN(dev_priv) >= 6) {

		drm_printf(m, "\tRING_IMR: %08x\n", I915_READ_IMR(engine));

	}



	drm_printf(m, "IRQ? 0x%lx (breadcrumbs? %s) (execlists? %s)\n",

		   engine->irq_posted,

		   yesno(test_bit(ENGINE_IRQ_BREADCRUMB,