Commit 3df01f5c authored by Michal Wajdeczko's avatar Michal Wajdeczko
Browse files

drm/xe/uc: Reorder post hwconfig uC initialization step 



We want to move the GuC submission initialization to the post
hwconfig step, but now this step is done too late as migration
initialization uses exec_queue that would crash due to a unset
exec_queue_ops. We can easily fix that by small function reorder.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240510203810.1952-2-michal.wajdeczko@intel.com
parent 04f4a70a

drivers/gpu/drm/xe/xe_gt.c

+4 −4
Original line number Diff line number Diff line
@@ -430,6 +430,10 @@ static int all_fw_domain_init(struct xe_gt *gt) 
	if (err)

		goto err_force_wake;



	err = xe_uc_init_post_hwconfig(&gt->uc);

	if (err)

		goto err_force_wake;



	if (!xe_gt_is_media_type(gt)) {

		/*

		 * USM has its only SA pool to non-block behind user operations
@@ -456,10 +460,6 @@ static int all_fw_domain_init(struct xe_gt *gt) 
		}

	}



	err = xe_uc_init_post_hwconfig(&gt->uc);

	if (err)

		goto err_force_wake;



	err = xe_uc_init_hw(&gt->uc);

	if (err)

		goto err_force_wake;