Skip to content

Commit 18635b6

Browse files
author
Maarten Lankhorst
committed
drm/xe: Rename xe_uc_init_hw to xe_uc_load_hw
It feels to me like load is closer to the intention than init_hw. It makes the init calls slightly less confusing to me. :) Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://lore.kernel.org/r/20250619104858.418440-24-dev@lankhorst.se Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
1 parent a42939e commit 18635b6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

drivers/gpu/drm/xe/xe_gt.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ static int gt_init_with_all_forcewake(struct xe_gt *gt)
573573
}
574574
}
575575

576-
err = xe_uc_init_hw(&gt->uc);
576+
err = xe_uc_load_hw(&gt->uc);
577577
if (err)
578578
goto err_force_wake;
579579

@@ -738,7 +738,7 @@ static int vf_gt_restart(struct xe_gt *gt)
738738
if (err)
739739
return err;
740740

741-
err = xe_uc_init_hw(&gt->uc);
741+
err = xe_uc_load_hw(&gt->uc);
742742
if (err)
743743
return err;
744744

@@ -776,7 +776,7 @@ static int do_gt_restart(struct xe_gt *gt)
776776
if (err)
777777
return err;
778778

779-
err = xe_uc_init_hw(&gt->uc);
779+
err = xe_uc_load_hw(&gt->uc);
780780
if (err)
781781
return err;
782782

drivers/gpu/drm/xe/xe_uc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ int xe_uc_sanitize_reset(struct xe_uc *uc)
144144
return uc_reset(uc);
145145
}
146146

147-
static int vf_uc_init_hw(struct xe_uc *uc)
147+
static int vf_uc_load_hw(struct xe_uc *uc)
148148
{
149149
int err;
150150

@@ -173,7 +173,7 @@ static int vf_uc_init_hw(struct xe_uc *uc)
173173
* Should be called during driver load, after every GT reset, and after every
174174
* suspend to reload / auth the firmwares.
175175
*/
176-
int xe_uc_init_hw(struct xe_uc *uc)
176+
int xe_uc_load_hw(struct xe_uc *uc)
177177
{
178178
int ret;
179179

@@ -182,7 +182,7 @@ int xe_uc_init_hw(struct xe_uc *uc)
182182
return 0;
183183

184184
if (IS_SRIOV_VF(uc_to_xe(uc)))
185-
return vf_uc_init_hw(uc);
185+
return vf_uc_load_hw(uc);
186186

187187
ret = xe_huc_upload(&uc->huc);
188188
if (ret)

drivers/gpu/drm/xe/xe_uc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ struct xe_uc;
1111
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);
14-
int xe_uc_init_hw(struct xe_uc *uc);
14+
int xe_uc_load_hw(struct xe_uc *uc);
1515
void xe_uc_gucrc_disable(struct xe_uc *uc);
1616
int xe_uc_reset_prepare(struct xe_uc *uc);
1717
void xe_uc_stop_prepare(struct xe_uc *uc);

0 commit comments

Comments
 (0)