Commit a42939ee authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/xe: Remove xe_uc_fini_hw 



xe_uc_init_hw() is called multiple times from xe_gt.c,
and that makes the name xe_uc_fini_hw(), called for a different
reason in xe_guc.c confusing.

Remove it and inline the xe_uc_sanitize_reset into xe_guc.c directly.

Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20250619104858.418440-23-dev@lankhorst.se


Signed-off-by: default avatarMaarten Lankhorst <dev@lankhorst.se>
parent 80fa03eb

drivers/gpu/drm/xe/xe_guc.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static void guc_fini_hw(void *arg) 
	unsigned int fw_ref;



	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);

	xe_uc_fini_hw(&guc_to_gt(guc)->uc);

	xe_uc_sanitize_reset(&guc_to_gt(guc)->uc);

	xe_force_wake_put(gt_to_fw(gt), fw_ref);



	guc_g2g_fini(guc);

drivers/gpu/drm/xe/xe_uc.c

+0 −5
Original line number Diff line number Diff line
@@ -220,11 +220,6 @@ int xe_uc_init_hw(struct xe_uc *uc) 
	return 0;

}



int xe_uc_fini_hw(struct xe_uc *uc)

{

	return xe_uc_sanitize_reset(uc);

}



int xe_uc_reset_prepare(struct xe_uc *uc)

{

	/* GuC submission not enabled, nothing to do */

drivers/gpu/drm/xe/xe_uc.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ int xe_uc_init_noalloc(struct xe_uc *uc); 
int xe_uc_init(struct xe_uc *uc);

int xe_uc_init_post_hwconfig(struct xe_uc *uc);

int xe_uc_init_hw(struct xe_uc *uc);

int xe_uc_fini_hw(struct xe_uc *uc);

void xe_uc_gucrc_disable(struct xe_uc *uc);

int xe_uc_reset_prepare(struct xe_uc *uc);

void xe_uc_stop_prepare(struct xe_uc *uc);