[PATCH v4 10/11] drm/xe: Remove xe_uc_fini_hw

[Lucas De Marchi]

On Thu, Jun 19, 2025 at 12:49:09PM +0200, Maarten Lankhorst wrote:
>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.
>
>Signed-off-by: Maarten Lankhorst <dev at lankhorst.se>


Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi

>---
> drivers/gpu/drm/xe/xe_guc.c | 2 +-
> drivers/gpu/drm/xe/xe_uc.c  | 5 -----
> drivers/gpu/drm/xe/xe_uc.h  | 1 -
> 3 files changed, 1 insertion(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
>index eeb23f8aa9de8..7a4207a2c1e0c 100644
>--- a/drivers/gpu/drm/xe/xe_guc.c
>+++ b/drivers/gpu/drm/xe/xe_guc.c
>@@ -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);
>diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c
>index 8f56a5ef41e24..1b1441b234c92 100644
>--- a/drivers/gpu/drm/xe/xe_uc.c
>+++ b/drivers/gpu/drm/xe/xe_uc.c
>@@ -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 */
>diff --git a/drivers/gpu/drm/xe/xe_uc.h b/drivers/gpu/drm/xe/xe_uc.h
>index c13d705fe02c4..58ff3946a80ec 100644
>--- a/drivers/gpu/drm/xe/xe_uc.h
>+++ b/drivers/gpu/drm/xe/xe_uc.h
>@@ -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);
>-- 
>2.45.2
>