From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [PATCH 07/11] drm/xe: Set firmware state to loadable before registering guc_fini_hw
Date: Fri, 9 Aug 2024 18:55:40 -0700 [thread overview]
Message-ID: <20240810015544.3443258-8-matthew.brost@intel.com> (raw)
In-Reply-To: <20240810015544.3443258-1-matthew.brost@intel.com>
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>
---
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 980691c178c4..9f2a7de47b9b 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;
@@ -362,8 +364,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
next prev parent reply other threads:[~2024-08-10 1:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-10 1:55 [PATCH 00/11] Fix error paths in driver load Matthew Brost
2024-08-10 1:55 ` [PATCH 01/11] drm/xe: use devm instead of drmm for managed bo Matthew Brost
2024-08-10 1:55 ` [PATCH 02/11] drm/xe/uc: Use managed bo for HuC and GSC objects Matthew Brost
2024-08-10 1:55 ` [PATCH 03/11] drm/xe/uc: Use devm to register cleanup that includes exec_queues Matthew Brost
2024-08-10 1:55 ` [PATCH 04/11] drm/xe: Fix tile fini sequence Matthew Brost
2024-08-10 1:55 ` [PATCH 05/11] drm/xe: Add driver load error injection Matthew Brost
2024-08-10 1:55 ` [PATCH 06/11] drm/xe: Move ggtt_fini to devm managed Matthew Brost
2024-08-10 1:55 ` Matthew Brost [this message]
2024-08-10 1:55 ` [PATCH 08/11] drm/xe: Drop warn on xe_guc_pc_gucrc_disable in guc pc fini Matthew Brost
2024-08-10 1:55 ` [PATCH 09/11] drm/xe: Move hw_engine_fini to devm managed Matthew Brost
2024-08-10 1:55 ` [PATCH 10/11] drm/xe: Move HuC init before GuC init Matthew Brost
2024-08-10 1:55 ` [PATCH 11/11] drm/xe: Update xe_sa to use xe_managed_bo_create_pin_map Matthew Brost
2024-08-10 2:01 ` ✓ CI.Patch_applied: success for Fix error paths in driver load Patchwork
2024-08-10 2:01 ` ✗ CI.checkpatch: warning " Patchwork
2024-08-10 2:01 ` ✗ CI.KUnit: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240810015544.3443258-8-matthew.brost@intel.com \
--to=matthew.brost@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox