[PATCH v2 2/6] drm/xe: Set firmware state to loadable before registering guc_fini_hw

[Lucas De Marchi]

On Tue, Aug 20, 2024 at 10:29:54AM GMT, Matthew Brost wrote:
>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 at intel.com>

Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi

>---
> drivers/gpu/drm/xe/xe_guc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
>index de0fe9e65746..52df28032a6f 100644
>--- a/drivers/gpu/drm/xe/xe_guc.c
>+++ b/drivers/gpu/drm/xe/xe_guc.c
>@@ -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:
>-- 
>2.34.1
>