drm/i915: Include ring->emit in debugging

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>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180307134226.25492-4-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index d8bc1bb30cb4afd7c0617d138984aef5cbadd7ea..34d12522a1da65e7456b16aff237f1ecf64a7867 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1922,8 +1922,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 4ba139c27fbad43cb81435229e92bab7eba6a1e1..048cd011484ca01ad0fa6f5a188c89677a7ec41e 100644 (file)
--- 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",
                           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();