drm/xe: Add GuC Submit Engine snapshot to xe_devcoredump.

Let's start to move our existent logs to devcoredump one by
one. Any format change should come on follow-up work.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_devcoredump.c b/drivers/gpu/drm/xe/xe_devcoredump.c
index b0e3db148ce26abfe1fa9bbe6ef829ccb684684f..7296c0137b47514934aef48778a2284f58f62e9c 100644 (file)
--- a/drivers/gpu/drm/xe/xe_devcoredump.c
+++ b/drivers/gpu/drm/xe/xe_devcoredump.c
@@ -12,6 +12,7 @@
 #include "xe_engine.h"
 #include "xe_gt.h"
 #include "xe_guc_ct.h"
+#include "xe_guc_submit.h"
 
 /**
  * DOC: Xe device coredump
@@ -86,6 +87,7 @@ static ssize_t xe_devcoredump_read(char *buffer, loff_t offset,
 
        drm_printf(&p, "\n**** GuC CT ****\n");
        xe_guc_ct_snapshot_print(coredump->snapshot.ct, &p);
+       xe_guc_engine_snapshot_print(coredump->snapshot.ge, &p);
 
        return count - iter.remain;
 }
@@ -99,6 +101,7 @@ static void xe_devcoredump_free(void *data)
                return;
 
        xe_guc_ct_snapshot_free(coredump->snapshot.ct);
+       xe_guc_engine_snapshot_free(coredump->snapshot.ge);
 
        coredump->captured = false;
        drm_info(&coredump_to_xe(coredump)->drm,
@@ -117,6 +120,7 @@ static void devcoredump_snapshot(struct xe_devcoredump *coredump,
 
        cookie = dma_fence_begin_signalling();
        coredump->snapshot.ct = xe_guc_ct_snapshot_capture(&guc->ct, true);
+       coredump->snapshot.ge = xe_guc_engine_snapshot_capture(e);
        dma_fence_end_signalling(cookie);
 }
 

diff --git a/drivers/gpu/drm/xe/xe_devcoredump_types.h b/drivers/gpu/drm/xe/xe_devcoredump_types.h
index 4e3371c7b9c5ca0dac345a50bbc1b7e4dd29a1cf..7c64532241391a5db3f66a0c05c076dd332a5cfd 100644 (file)
--- a/drivers/gpu/drm/xe/xe_devcoredump_types.h
+++ b/drivers/gpu/drm/xe/xe_devcoredump_types.h
@@ -27,6 +27,8 @@ struct xe_devcoredump_snapshot {
        /* GuC snapshots */
        /** @ct_snapshot: GuC CT snapshot */
        struct xe_guc_ct_snapshot *ct;
+       /** @ge: Guc Engine snapshot */
+       struct xe_guc_submit_engine_snapshot *ge;
 };
 
 /**