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: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20250619104858.418440-23-dev@lankhorst.se
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>

diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
index eeb23f8aa9de81732fe0698c3e27dbc040cbf4c0..7a4207a2c1e0cbd3c85e89b7c74193faf1c06c40 100644 (file)
--- 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 52f0b0ecf5a9d546e69e9e6455300989369ec9ae..c66db45ba250ed87d0b22e3a9f9e1698cc342683 100644 (file)
--- 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 c13d705fe02c4ae94f00d5ff24c6b6fa4fb0d223..58ff3946a80ec35c78f2bf244b04a3b117aa07ad 100644 (file)
--- 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);