drm/xe: Make GUC binaries dump consistent with other binaries in devcoredump

All other(hwsp, hwctx and vmas) binaries follow this format:
[name].length: 0x1000
[name].data: xxxxxxx
[name].error: errno

The error one is just in case by some reason it was not able to
capture the binary.

So this GuC binaries should follow the same patern.

v2:
- renamed GUC binary to LOG

Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250123202307.95103-3-jose.souza@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
(cherry picked from commit cb1f868ca13756c0c18ba54d1591332476760d07)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
index 50c8076b51585219a599bc1f95055b709777ba20..497036675a38c6b406741a0dcbebefd22eef5283 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_ct.c
+++ b/drivers/gpu/drm/xe/xe_guc_ct.c
@@ -1723,9 +1723,11 @@ void xe_guc_ct_snapshot_print(struct xe_guc_ct_snapshot *snapshot,
                drm_printf(p, "\tg2h outstanding: %d\n",
                           snapshot->g2h_outstanding);
 
-               if (snapshot->ctb)
-                       xe_print_blob_ascii85(p, "CTB data", '\n',
+               if (snapshot->ctb) {
+                       drm_printf(p, "[CTB].length: 0x%lx\n", snapshot->ctb_size);
+                       xe_print_blob_ascii85(p, "[CTB].data", '\n',
                                              snapshot->ctb, 0, snapshot->ctb_size);
+               }
        } else {
                drm_puts(p, "CT disabled\n");
        }

diff --git a/drivers/gpu/drm/xe/xe_guc_log.c b/drivers/gpu/drm/xe/xe_guc_log.c
index 2baa4d95571fbfef3e5c4d4777933dfb14b72bb7..2457572ed86ad11e66b87c0c8b29b5cb41a770c6 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_log.c
+++ b/drivers/gpu/drm/xe/xe_guc_log.c
@@ -208,10 +208,11 @@ void xe_guc_log_snapshot_print(struct xe_guc_log_snapshot *snapshot, struct drm_
        drm_printf(p, "GuC timestamp: 0x%08llX [%llu]\n", snapshot->stamp, snapshot->stamp);
        drm_printf(p, "Log level: %u\n", snapshot->level);
 
+       drm_printf(p, "[LOG].length: 0x%lx\n", snapshot->size);
        remain = snapshot->size;
        for (i = 0; i < snapshot->num_chunks; i++) {
                size_t size = min(GUC_LOG_CHUNK_SIZE, remain);
-               const char *prefix = i ? NULL : "Log data";
+               const char *prefix = i ? NULL : "[LOG].data";
                char suffix = i == snapshot->num_chunks - 1 ? '\n' : 0;
 
                xe_print_blob_ascii85(p, prefix, suffix, snapshot->copy[i], 0, size);