Commit 10309420 authored by Michal Wajdeczko's avatar Michal Wajdeczko
Browse files

drm/xe/debugfs: Update xe_gt_topology_dump signature 



Our debugfs helper xe_gt_debugfs_show_with_rpm() expects print()
functions to return int. New signature allows us to drop wrapper.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/20250923211613.193347-2-michal.wajdeczko@intel.com
parent 486d7f1b

drivers/gpu/drm/xe/xe_gt_debugfs.c

+1 −7
Original line number Diff line number Diff line
@@ -136,12 +136,6 @@ static int hw_engines(struct xe_gt *gt, struct drm_printer *p) 
	return ret;

}



static int topology(struct xe_gt *gt, struct drm_printer *p)

{

	xe_gt_topology_dump(gt, p);

	return 0;

}



static int steering(struct xe_gt *gt, struct drm_printer *p)

{

	xe_gt_mcr_steering_dump(gt, p);
@@ -239,7 +233,7 @@ static int hwconfig(struct xe_gt *gt, struct drm_printer *p) 
 * - without access to the PF specific data

 */

static const struct drm_info_list vf_safe_debugfs_list[] = {

	{ "topology", .show = xe_gt_debugfs_show_with_rpm, .data = topology },

	{ "topology", .show = xe_gt_debugfs_show_with_rpm, .data = xe_gt_topology_dump },

	{ "register-save-restore",

		.show = xe_gt_debugfs_show_with_rpm, .data = register_save_restore },

	{ "workarounds", .show = xe_gt_debugfs_show_with_rpm, .data = workarounds },

drivers/gpu/drm/xe/xe_gt_topology.c

+9 −2
Original line number Diff line number Diff line
@@ -269,8 +269,14 @@ static const char *eu_type_to_str(enum xe_gt_eu_type eu_type) 
	return NULL;

}



void

xe_gt_topology_dump(struct xe_gt *gt, struct drm_printer *p)

/**

 * xe_gt_topology_dump() - Dump GT topology into a drm printer.

 * @gt: the &xe_gt

 * @p: the &drm_printer

 *

 * Return: always 0.

 */

int xe_gt_topology_dump(struct xe_gt *gt, struct drm_printer *p)

{

	drm_printf(p, "dss mask (geometry): %*pb\n", XE_MAX_DSS_FUSE_BITS,

		   gt->fuse_topo.g_dss_mask);
@@ -285,6 +291,7 @@ xe_gt_topology_dump(struct xe_gt *gt, struct drm_printer *p) 
	if (xe_gt_topology_report_l3(gt))

		drm_printf(p, "L3 bank mask:        %*pb\n", XE_MAX_L3_BANK_MASK_BITS,

			   gt->fuse_topo.l3_bank_mask);

	return 0;

}



/*

drivers/gpu/drm/xe/xe_gt_topology.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct drm_printer; 


void xe_gt_topology_init(struct xe_gt *gt);



void xe_gt_topology_dump(struct xe_gt *gt, struct drm_printer *p);

int xe_gt_topology_dump(struct xe_gt *gt, struct drm_printer *p);



/**

 * xe_gt_topology_mask_last_dss() - Returns the index of the last DSS in a mask.