drm/xe: Add ring address to LRC snapshot

The ring is currently in LRC BO but this may change going forward.
Include the ring address in the snapshot protecting again any future
changes.

v2:
 - s/ring_desc/ring_addr (Jonathan)

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241114022522.1951351-3-matthew.brost@intel.com

diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index e0d80e8..cc77e51 100644 (file)
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -1636,6 +1636,7 @@ struct xe_lrc_snapshot *xe_lrc_snapshot_capture(struct xe_lrc *lrc)
                xe_vm_get(lrc->bo->vm);
 
        snapshot->context_desc = xe_lrc_ggtt_addr(lrc);
+       snapshot->ring_addr = __xe_lrc_ring_ggtt_addr(lrc);
        snapshot->indirect_context_desc = xe_lrc_indirect_ring_ggtt_addr(lrc);
        snapshot->head = xe_lrc_ring_head(lrc);
        snapshot->tail.internal = lrc->ring.tail;
@@ -1693,6 +1694,8 @@ void xe_lrc_snapshot_print(struct xe_lrc_snapshot *snapshot, struct drm_printer
                return;
 
        drm_printf(p, "\tHW Context Desc: 0x%08x\n", snapshot->context_desc);
+       drm_printf(p, "\tHW Ring address: 0x%08x\n",
+                  snapshot->ring_addr);
        drm_printf(p, "\tHW Indirect Ring State: 0x%08x\n",
                   snapshot->indirect_context_desc);
        drm_printf(p, "\tLRC Head: (memory) %u\n", snapshot->head);

diff --git a/drivers/gpu/drm/xe/xe_lrc.h b/drivers/gpu/drm/xe/xe_lrc.h
index 9d64ced..37ca321 100644 (file)
--- a/drivers/gpu/drm/xe/xe_lrc.h
+++ b/drivers/gpu/drm/xe/xe_lrc.h
@@ -25,6 +25,7 @@ struct xe_lrc_snapshot {
        unsigned long lrc_size, lrc_offset;
 
        u32 context_desc;
+       u32 ring_addr;
        u32 indirect_context_desc;
        u32 head;
        struct {