Re: [PATCH 4/6] drm/i915: Include ring->emit in debugging

Mika Kuoppala
2018-03-09T13:49:43Z

Chris Wilson <chris@chris-wilson.co.uk> writes:

> Include ring->emit and ring->space alongside ring->(head,tail) when
> printing debug information.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 4 ++--
> drivers/gpu/drm/i915/intel_engine_cs.c | 10 +++++++---
> 2 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index e838c765b251..4de0a52f14a9 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -1923,8 +1923,8 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
>
> static void describe_ctx_ring(struct seq_file *m, struct intel_ring *ring)
> {
> - seq_printf(m, " (ringbuffer, space: %d, head: %u, tail: %u)",
> - ring->space, ring->head, ring->tail);
> + seq_printf(m, " (ringbuffer, space: %d, head: %u, tail: %u, emit: %u)",
> + ring->space, ring->head, ring->tail, ring->emit);
> }
>
> static int i915_context_status(struct seq_file *m, void *unused)
> diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
> index 4ba139c27fba..e71bd6951d9b 100644
> --- a/drivers/gpu/drm/i915/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> @@ -1929,12 +1929,16 @@ void intel_engine_dump(struct intel_engine_cs *engine,
> rq->head, rq->postfix, rq->tail,
> rq->batch ? upper_32_bits(rq->batch->node.start) : ~0u,
> rq->batch ? lower_32_bits(rq->batch->node.start) : ~0u);
> - drm_printf(m, "\t\tring->start: 0x%08x\n",
> + drm_printf(m, "\t\tring->start : 0x%08x\n",

Please check the space before ':', seems unintentional.

Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

> i915_ggtt_offset(rq->ring->vma));
> - drm_printf(m, "\t\tring->head: 0x%08x\n",
> + drm_printf(m, "\t\tring->head: 0x%08x\n",
> rq->ring->head);
> - drm_printf(m, "\t\tring->tail: 0x%08x\n",
> + drm_printf(m, "\t\tring->tail: 0x%08x\n",
> rq->ring->tail);
> + drm_printf(m, "\t\tring->emit: 0x%08x\n",
> + rq->ring->emit);
> + drm_printf(m, "\t\tring->space: 0x%08x\n",
> + rq->ring->space);
> }
>
> rcu_read_unlock();
> --
> 2.16.2