Skip to content

Commit 70fb86a

Browse files
johnharr-intelrodrigovivi
authored andcommitted
drm/xe: Revert some changes that break a mesa debug tool
There is a mesa debug tool for decoding devcoredump files. Recent changes to improve the devcoredump output broke that tool. So revert the changes until the tool can be extended to support the new fields. Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Fixes: c28fd6c ("drm/xe/devcoredump: Improve section headings and add tile info") Fixes: ec1455c ("drm/xe/devcoredump: Add ASCII85 dump helper function") Cc: John Harrison <John.C.Harrison@Intel.com> Cc: Julia Filipchuk <julia.filipchuk@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: intel-xe@lists.freedesktop.org Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241213172833.1733376-1-John.C.Harrison@Intel.com Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent f0d3a3c commit 70fb86a

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

drivers/gpu/drm/xe/xe_devcoredump.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,11 @@ static ssize_t __xe_devcoredump_read(char *buffer, size_t count,
119119
drm_puts(&p, "\n**** GuC CT ****\n");
120120
xe_guc_ct_snapshot_print(ss->guc.ct, &p);
121121

122-
drm_puts(&p, "\n**** Contexts ****\n");
122+
/*
123+
* Don't add a new section header here because the mesa debug decoder
124+
* tool expects the context information to be in the 'GuC CT' section.
125+
*/
126+
/* drm_puts(&p, "\n**** Contexts ****\n"); */
123127
xe_guc_exec_queue_snapshot_print(ss->ge, &p);
124128

125129
drm_puts(&p, "\n**** Job ****\n");
@@ -416,6 +420,15 @@ void xe_print_blob_ascii85(struct drm_printer *p, const char *prefix,
416420
char buff[ASCII85_BUFSZ], *line_buff;
417421
size_t line_pos = 0;
418422

423+
/*
424+
* Splitting blobs across multiple lines is not compatible with the mesa
425+
* debug decoder tool. Note that even dropping the explicit '\n' below
426+
* doesn't help because the GuC log is so big some underlying implementation
427+
* still splits the lines at 512K characters. So just bail completely for
428+
* the moment.
429+
*/
430+
return;
431+
419432
#define DMESG_MAX_LINE_LEN 800
420433
#define MIN_SPACE (ASCII85_BUFSZ + 2) /* 85 + "\n\0" */
421434

0 commit comments

Comments
 (0)