Commit 7704f32c authored by Michał Winiarski's avatar Michał Winiarski Committed by Rodrigo Vivi
Browse files

drm/xe/uc: Extract xe_uc_sanitize_reset 



Earlier GuC load will require more fine-grained control over reset.
Extract it outside of xe_uc_init_hw.

Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent bf2d0d88

drivers/gpu/drm/xe/xe_gt.c

+4 −0
Original line number Diff line number Diff line
@@ -542,6 +542,10 @@ static int do_gt_restart(struct xe_gt *gt) 
	for_each_hw_engine(hwe, gt, id)

		xe_hw_engine_enable_ring(hwe);



	err = xe_uc_sanitize_reset(&gt->uc);

	if (err)

		return err;



	err = xe_uc_init_hw(&gt->uc);

	if (err)

		return err;

drivers/gpu/drm/xe/xe_uc.c

+6 −6
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ int xe_uc_init_post_hwconfig(struct xe_uc *uc) 
	if (!xe_device_uc_enabled(uc_to_xe(uc)))

		return 0;



	err = xe_uc_sanitize_reset(uc);

	if (err)

		return err;



	err = xe_guc_init_post_hwconfig(&uc->guc);

	if (err)

		return err;
@@ -101,13 +105,13 @@ static int uc_reset(struct xe_uc *uc) 
	return 0;

}



void xe_uc_sanitize(struct xe_uc *uc)

static void xe_uc_sanitize(struct xe_uc *uc)

{

	xe_huc_sanitize(&uc->huc);

	xe_guc_sanitize(&uc->guc);

}



static int xe_uc_sanitize_reset(struct xe_uc *uc)

int xe_uc_sanitize_reset(struct xe_uc *uc)

{

	xe_uc_sanitize(uc);
@@ -147,10 +151,6 @@ int xe_uc_init_hw(struct xe_uc *uc) 
	if (!xe_device_uc_enabled(uc_to_xe(uc)))

		return 0;



	ret = xe_uc_sanitize_reset(uc);

	if (ret)

		return ret;



	ret = xe_huc_upload(&uc->huc);

	if (ret)

		return ret;

drivers/gpu/drm/xe/xe_uc.h

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ void xe_uc_stop_prepare(struct xe_uc *uc); 
int xe_uc_stop(struct xe_uc *uc);

int xe_uc_start(struct xe_uc *uc);

int xe_uc_suspend(struct xe_uc *uc);

void xe_uc_sanitize(struct xe_uc *uc);

int xe_uc_sanitize_reset(struct xe_uc *uc);



#endif