Skip to content

Commit b5de6a5

Browse files
committed
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: Matthew Brost <matthew.brost@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240820172958.1095143-3-matthew.brost@intel.com
1 parent 5b993d0 commit b5de6a5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/xe/xe_guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,8 @@ int xe_guc_init(struct xe_guc *guc)
350350
if (ret)
351351
goto out;
352352

353+
xe_uc_fw_change_status(&guc->fw, XE_UC_FIRMWARE_LOADABLE);
354+
353355
ret = devm_add_action_or_reset(xe->drm.dev, guc_fini_hw, guc);
354356
if (ret)
355357
goto out;
@@ -358,8 +360,6 @@ int xe_guc_init(struct xe_guc *guc)
358360

359361
xe_guc_comm_init_early(guc);
360362

361-
xe_uc_fw_change_status(&guc->fw, XE_UC_FIRMWARE_LOADABLE);
362-
363363
return 0;
364364

365365
out:

0 commit comments

Comments
 (0)