Message ID | 20171209104418.4223-2-chris@chris-wilson.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Sat, 2017-12-09 at 10:44 +0000, Chris Wilson wrote: > Since the seqno information shown from i915_interrupt_info is just a > small subset of i915_engine_info, remove it. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> One comment below. Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > +++ b/drivers/gpu/drm/i915/intel_engine_cs.c > @@ -1690,6 +1690,11 @@ void intel_engine_dump(struct intel_engine_cs *engine, > if (i915_terminally_wedged(&engine->i915->gpu_error)) > drm_printf(m, "*** WEDGED ***\n"); > > + if (INTEL_GEN(dev_priv) >= 6) { > + drm_printf(m, "\tInterrupt mask: %08x\n", > + I915_READ_IMR(engine)); Next printf is not capitalized. Regards, Joonas
Quoting Joonas Lahtinen (2017-12-11 09:08:53) > On Sat, 2017-12-09 at 10:44 +0000, Chris Wilson wrote: > > Since the seqno information shown from i915_interrupt_info is just a > > small subset of i915_engine_info, remove it. > > > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > > One comment below. > > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > > +++ b/drivers/gpu/drm/i915/intel_engine_cs.c > > @@ -1690,6 +1690,11 @@ void intel_engine_dump(struct intel_engine_cs *engine, > > if (i915_terminally_wedged(&engine->i915->gpu_error)) > > drm_printf(m, "*** WEDGED ***\n"); > > > > + if (INTEL_GEN(dev_priv) >= 6) { > > + drm_printf(m, " Interrupt mask: %08x\n", > > + I915_READ_IMR(engine)); > > Next printf is not capitalized. Renamed it to RING_IMR (since we are already RING_foo for the other registers) and moved it down next to the waitqueue printing. Thanks for the review, pushed. -Chris
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index bebf33333ae3..f91dd68c53a1 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -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) { + 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); diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c index 04c31475a7ae..f879e183bd92 100644 --- a/drivers/gpu/drm/i915/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/intel_engine_cs.c @@ -1690,6 +1690,11 @@ void intel_engine_dump(struct intel_engine_cs *engine, if (i915_terminally_wedged(&engine->i915->gpu_error)) drm_printf(m, "*** WEDGED ***\n"); + if (INTEL_GEN(dev_priv) >= 6) { + drm_printf(m, "\tInterrupt mask: %08x\n", + I915_READ_IMR(engine)); + } + 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),
Since the seqno information shown from i915_interrupt_info is just a small subset of i915_engine_info, remove it. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_debugfs.c | 24 ++---------------------- drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++++ 2 files changed, 7 insertions(+), 22 deletions(-)