Commit 18635b63 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

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: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20250619104858.418440-24-dev@lankhorst.se


Signed-off-by: default avatarMaarten Lankhorst <dev@lankhorst.se>
parent a42939ee

drivers/gpu/drm/xe/xe_gt.c

+3 −3
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ static int gt_init_with_all_forcewake(struct xe_gt *gt) 
		}

	}



	err = xe_uc_init_hw(&gt->uc);

	err = xe_uc_load_hw(&gt->uc);

	if (err)

		goto err_force_wake;
@@ -738,7 +738,7 @@ static int vf_gt_restart(struct xe_gt *gt) 
	if (err)

		return err;



	err = xe_uc_init_hw(&gt->uc);

	err = xe_uc_load_hw(&gt->uc);

	if (err)

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

		return err;



	err = xe_uc_init_hw(&gt->uc);

	err = xe_uc_load_hw(&gt->uc);

	if (err)

		return err;

drivers/gpu/drm/xe/xe_uc.c

+3 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ int xe_uc_sanitize_reset(struct xe_uc *uc) 
	return uc_reset(uc);

}



static int vf_uc_init_hw(struct xe_uc *uc)

static int vf_uc_load_hw(struct xe_uc *uc)

{

	int err;
@@ -173,7 +173,7 @@ static int vf_uc_init_hw(struct xe_uc *uc) 
 * Should be called during driver load, after every GT reset, and after every

 * suspend to reload / auth the firmwares.

 */

int xe_uc_init_hw(struct xe_uc *uc)

int xe_uc_load_hw(struct xe_uc *uc)

{

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



	if (IS_SRIOV_VF(uc_to_xe(uc)))

		return vf_uc_init_hw(uc);

		return vf_uc_load_hw(uc);



	ret = xe_huc_upload(&uc->huc);

	if (ret)

drivers/gpu/drm/xe/xe_uc.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ struct xe_uc; 
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_load_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);