Commit 7606f7d0 authored by Michał Winiarski's avatar Michał Winiarski Committed by Rodrigo Vivi
Browse files

drm/xe/huc: Realloc HuC FW in vram for post-hwconfig 



Similar to GuC, we're using system memory for the initial stage, and
move the image to vram when it's available for subsequent loads (e.g.
after reset).

Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240219130530.1406044-2-michal.winiarski@intel.com
parent a44bbace

drivers/gpu/drm/xe/xe_huc.c

+19 −0
Original line number Diff line number Diff line
@@ -112,6 +112,25 @@ int xe_huc_init(struct xe_huc *huc) 
	return ret;

}



int xe_huc_init_post_hwconfig(struct xe_huc *huc)

{

	struct xe_tile *tile = gt_to_tile(huc_to_gt(huc));

	struct xe_device *xe = huc_to_xe(huc);

	int ret;



	if (!IS_DGFX(huc_to_xe(huc)))

		return 0;



	if (!xe_uc_fw_is_loadable(&huc->fw))

		return 0;



	ret = xe_managed_bo_reinit_in_vram(xe, tile, &huc->fw.bo);

	if (ret)

		return ret;



	return 0;

}



int xe_huc_upload(struct xe_huc *huc)

{

	if (!xe_uc_fw_is_loadable(&huc->fw))

drivers/gpu/drm/xe/xe_huc.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ enum xe_huc_auth_types { 
};



int xe_huc_init(struct xe_huc *huc);

int xe_huc_init_post_hwconfig(struct xe_huc *huc);

int xe_huc_upload(struct xe_huc *huc);

int xe_huc_auth(struct xe_huc *huc, enum xe_huc_auth_types type);

bool xe_huc_is_authenticated(struct xe_huc *huc, enum xe_huc_auth_types type);

drivers/gpu/drm/xe/xe_uc.c

+4 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ int xe_uc_init_post_hwconfig(struct xe_uc *uc) 
	if (err)

		return err;



	err = xe_huc_init_post_hwconfig(&uc->huc);

	if (err)

		return err;



	return xe_gsc_init_post_hwconfig(&uc->gsc);

}