tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Maarten Lankhorst 18635b63 a42939ee

+7 -7
+3 -3
drivers/gpu/drm/xe/xe_gt.c
··· 573 573 } 574 574 } 575 575 576 - err = xe_uc_init_hw(&gt->uc); 576 + err = xe_uc_load_hw(&gt->uc); 577 577 if (err) 578 578 goto err_force_wake; 579 579 ··· 738 738 if (err) 739 739 return err; 740 740 741 - err = xe_uc_init_hw(&gt->uc); 741 + err = xe_uc_load_hw(&gt->uc); 742 742 if (err) 743 743 return err; 744 744 ··· 776 776 if (err) 777 777 return err; 778 778 779 - err = xe_uc_init_hw(&gt->uc); 779 + err = xe_uc_load_hw(&gt->uc); 780 780 if (err) 781 781 return err; 782 782
+3 -3
drivers/gpu/drm/xe/xe_uc.c
··· 144 144 return uc_reset(uc); 145 145 } 146 146 147 - static int vf_uc_init_hw(struct xe_uc *uc) 147 + static int vf_uc_load_hw(struct xe_uc *uc) 148 148 { 149 149 int err; 150 150 ··· 173 173 * Should be called during driver load, after every GT reset, and after every 174 174 * suspend to reload / auth the firmwares. 175 175 */ 176 - int xe_uc_init_hw(struct xe_uc *uc) 176 + int xe_uc_load_hw(struct xe_uc *uc) 177 177 { 178 178 int ret; 179 179 ··· 182 182 return 0; 183 183 184 184 if (IS_SRIOV_VF(uc_to_xe(uc))) 185 - return vf_uc_init_hw(uc); 185 + return vf_uc_load_hw(uc); 186 186 187 187 ret = xe_huc_upload(&uc->huc); 188 188 if (ret)
+1 -1
drivers/gpu/drm/xe/xe_uc.h
··· 11 11 int xe_uc_init_noalloc(struct xe_uc *uc); 12 12 int xe_uc_init(struct xe_uc *uc); 13 13 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); 15 15 void xe_uc_gucrc_disable(struct xe_uc *uc); 16 16 int xe_uc_reset_prepare(struct xe_uc *uc); 17 17 void xe_uc_stop_prepare(struct xe_uc *uc);