Commit c28fd6c3 authored by John Harrison's avatar John Harrison
Browse files

drm/xe/devcoredump: Improve section headings and add tile info 



The xe_guc_exec_queue_snapshot is not really a GuC internal thing and
is definitely not a GuC CT thing. So give it its own section heading.
The snapshot itself is really a capture of the submission backend's
internal state. Although all it currently prints out is the submission
contexts. So label it as 'Contexts'. If more general state is added
later then it could be change to 'Submission backend' or some such.

Further, everything from the GuC CT section onwards is GT specific but
there was no indication of which GT it was related to (and that is
impossible to work out from the other fields that are given). So add a
GT section heading. Also include the tile id of the GT, because again
significant information.

Lastly, drop a couple of unnecessary line feeds within sections.

v2: Add GT section heading, add tile id to device section.

Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarJulia Filipchuk <julia.filipchuk@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241003004611.2323493-4-John.C.Harrison@Intel.com
parent 9d86d080

drivers/gpu/drm/xe/xe_devcoredump.c

+5 −0
Original line number Diff line number Diff line
@@ -96,8 +96,13 @@ static ssize_t __xe_devcoredump_read(char *buffer, size_t count, 
	drm_printf(&p, "Process: %s\n", ss->process_name);

	xe_device_snapshot_print(xe, &p);



	drm_printf(&p, "\n**** GT #%d ****\n", ss->gt->info.id);

	drm_printf(&p, "\tTile: %d\n", ss->gt->tile->id);



	drm_puts(&p, "\n**** GuC CT ****\n");

	xe_guc_ct_snapshot_print(ss->ct, &p);



	drm_puts(&p, "\n**** Contexts ****\n");

	xe_guc_exec_queue_snapshot_print(ss->ge, &p);



	drm_puts(&p, "\n**** Job ****\n");

drivers/gpu/drm/xe/xe_devcoredump_types.h

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ struct xe_devcoredump_snapshot { 
	/* GuC snapshots */

	/** @ct: GuC CT snapshot */

	struct xe_guc_ct_snapshot *ct;

	/** @ge: Guc Engine snapshot */



	/** @ge: GuC Submission Engine snapshot */

	struct xe_guc_submit_exec_queue_snapshot *ge;



	/** @hwe: HW Engine snapshot array */

drivers/gpu/drm/xe/xe_device.c

+1 −0
Original line number Diff line number Diff line
@@ -964,6 +964,7 @@ void xe_device_snapshot_print(struct xe_device *xe, struct drm_printer *p) 


	for_each_gt(gt, xe, id) {

		drm_printf(p, "GT id: %u\n", id);

		drm_printf(p, "\tTile: %u\n", gt->tile->id);

		drm_printf(p, "\tType: %s\n",

			   gt->info.type == XE_GT_TYPE_MAIN ? "main" : "media");

		drm_printf(p, "\tIP ver: %u.%u.%u\n",

drivers/gpu/drm/xe/xe_guc_submit.c

+1 −1
Original line number Diff line number Diff line
@@ -2237,7 +2237,7 @@ xe_guc_exec_queue_snapshot_print(struct xe_guc_submit_exec_queue_snapshot *snaps 
	if (!snapshot)

		return;



	drm_printf(p, "\nGuC ID: %d\n", snapshot->guc.id);

	drm_printf(p, "GuC ID: %d\n", snapshot->guc.id);

	drm_printf(p, "\tName: %s\n", snapshot->name);

	drm_printf(p, "\tClass: %d\n", snapshot->class);

	drm_printf(p, "\tLogical mask: 0x%x\n", snapshot->logical_mask);

drivers/gpu/drm/xe/xe_hw_engine.c

+0 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,6 @@ void xe_hw_engine_snapshot_print(struct xe_hw_engine_snapshot *snapshot, 
	if (snapshot->hwe->class == XE_ENGINE_CLASS_COMPUTE)

		drm_printf(p, "\tRCU_MODE: 0x%08x\n",

			   snapshot->reg.rcu_mode);

	drm_puts(p, "\n");

}



/**