Skip to content

Commit a42939e

Browse files
author
Maarten Lankhorst
committed
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>
1 parent 80fa03e commit a42939e

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

drivers/gpu/drm/xe/xe_guc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ static void guc_fini_hw(void *arg)
577577
unsigned int fw_ref;
578578

579579
fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
580-
xe_uc_fini_hw(&guc_to_gt(guc)->uc);
580+
xe_uc_sanitize_reset(&guc_to_gt(guc)->uc);
581581
xe_force_wake_put(gt_to_fw(gt), fw_ref);
582582

583583
guc_g2g_fini(guc);

drivers/gpu/drm/xe/xe_uc.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,6 @@ int xe_uc_init_hw(struct xe_uc *uc)
220220
return 0;
221221
}
222222

223-
int xe_uc_fini_hw(struct xe_uc *uc)
224-
{
225-
return xe_uc_sanitize_reset(uc);
226-
}
227-
228223
int xe_uc_reset_prepare(struct xe_uc *uc)
229224
{
230225
/* GuC submission not enabled, nothing to do */

drivers/gpu/drm/xe/xe_uc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ int xe_uc_init_noalloc(struct xe_uc *uc);
1212
int xe_uc_init(struct xe_uc *uc);
1313
int xe_uc_init_post_hwconfig(struct xe_uc *uc);
1414
int xe_uc_init_hw(struct xe_uc *uc);
15-
int xe_uc_fini_hw(struct xe_uc *uc);
1615
void xe_uc_gucrc_disable(struct xe_uc *uc);
1716
int xe_uc_reset_prepare(struct xe_uc *uc);
1817
void xe_uc_stop_prepare(struct xe_uc *uc);

0 commit comments

Comments
 (0)