Commit b5de6a5c authored by Matthew Brost's avatar Matthew Brost
Browse files

drm/xe: Set firmware state to loadable before registering guc_fini_hw 



The guc_fini_hw registered calls __xe_uc_fw_status which is only
expected to be called after initializing fw state. Move this before
registering guc_fini_hw.

Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240820172958.1095143-3-matthew.brost@intel.com
parent 5b993d00

drivers/gpu/drm/xe/xe_guc.c

+2 −2
Original line number Diff line number Diff line
@@ -350,6 +350,8 @@ int xe_guc_init(struct xe_guc *guc) 
	if (ret)

		goto out;



	xe_uc_fw_change_status(&guc->fw, XE_UC_FIRMWARE_LOADABLE);



	ret = devm_add_action_or_reset(xe->drm.dev, guc_fini_hw, guc);

	if (ret)

		goto out;
@@ -358,8 +360,6 @@ int xe_guc_init(struct xe_guc *guc) 


	xe_guc_comm_init_early(guc);



	xe_uc_fw_change_status(&guc->fw, XE_UC_FIRMWARE_LOADABLE);



	return 0;



out: