drm/i915: kill waiting_seqno

The waiting_seqno is not terribly useful, and as such we can remove it
so that we'll be able to extract lockless code.

v2: Keep the information for error_state (Chris)
Check if ring is initialized in hangcheck (Chris)
Capture the waiting ring (Chris)

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
[danvet: add some bikeshed to clarify a comment.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 8ed034233e38..9d4bf6bfc46a 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -414,8 +414,6 @@ static void i915_ring_seqno_info(struct seq_file *m,
         if (ring->get_seqno) {
                 seq_printf(m, "Current sequence (%s): %d\n",
                            ring->name, ring->get_seqno(ring));
-                seq_printf(m, "Waiter sequence (%s):  %d\n",
-                           ring->name, ring->waiting_seqno);
                 seq_printf(m, "IRQ sequence (%s):     %d\n",
                            ring->name, ring->irq_seqno);
         }
@@ -687,6 +685,7 @@ static void i915_ring_error_state(struct seq_file *m,
                            error->semaphore_mboxes[ring][1]);
         }
         seq_printf(m, "  seqno: 0x%08x\n", error->seqno[ring]);
+        seq_printf(m, "  waiting: %s\n", yesno(error->waiting[ring]));
         seq_printf(m, "  ring->head: 0x%08x\n", error->cpu_ring_head[ring]);
         seq_printf(m, "  ring->tail: 0x%08x\n", error->cpu_ring_tail[ring]);
 }