The shadow ring regs (ring->head, ring->tail) are meaningless in the
post-mortem dump as they do not related to anything on HW. Remove them
from the coredump.

Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 5 -----
 drivers/gpu/drm/i915/i915_gpu_error.h | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c 
b/drivers/gpu/drm/i915/i915_gpu_error.c
index b45c128d0a17..a35aad439281 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -553,8 +553,6 @@ static void error_print_engine(struct 
drm_i915_error_state_buf *m,
                                   ee->vm_info.pp_dir_base);
                }
        }
-       err_printf(m, "  ring->head: 0x%08x\n", ee->cpu_ring_head);
-       err_printf(m, "  ring->tail: 0x%08x\n", ee->cpu_ring_tail);
        err_printf(m, "  engine reset count: %u\n", ee->reset_count);
 
        for (n = 0; n < ee->num_ports; n++) {
@@ -1428,9 +1426,6 @@ intel_engine_coredump_add_request(struct 
intel_engine_coredump *ee,
        if (HAS_BROKEN_CS_TLB(rq->i915))
                vma = capture_vma(vma, ee->engine->gt->scratch, "WA batch", 
gfp);
 
-       ee->cpu_ring_head = rq->ring->head;
-       ee->cpu_ring_tail = rq->ring->tail;
-
        ee->rq_head = rq->head;
        ee->rq_post = rq->postfix;
        ee->rq_tail = rq->tail;
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h 
b/drivers/gpu/drm/i915/i915_gpu_error.h
index 0df9d8c32056..8f4579d64d8c 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.h
+++ b/drivers/gpu/drm/i915/i915_gpu_error.h
@@ -66,10 +66,6 @@ struct intel_engine_coredump {
        /* position of active request inside the ring */
        u32 rq_head, rq_post, rq_tail;
 
-       /* our own tracking of ring head and tail */
-       u32 cpu_ring_head;
-       u32 cpu_ring_tail;
-
        /* Register state */
        u32 ccid;
        u32 start;
-- 
2.25.0.rc1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to