Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [PATCH v2 2/6] drm/xe: Set firmware state to loadable before registering guc_fini_hw
Date: Tue, 20 Aug 2024 10:29:54 -0700	[thread overview]
Message-ID: <20240820172958.1095143-3-matthew.brost@intel.com> (raw)
In-Reply-To: <20240820172958.1095143-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 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


  parent reply	other threads:[~2024-08-20 17:29 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-20 17:29 [PATCH v2 0/6] Driver load failure fixes Matthew Brost
2024-08-20 17:29 ` [PATCH v2 1/6] drm/xe: Move ggtt_fini to devm managed Matthew Brost
2024-08-23 13:43   ` Lucas De Marchi
2024-08-20 17:29 ` Matthew Brost [this message]
2024-08-20 21:04   ` [PATCH v2 2/6] drm/xe: Set firmware state to loadable before registering guc_fini_hw Lucas De Marchi
2024-08-20 17:29 ` [PATCH v2 3/6] drm/xe: Drop warn on xe_guc_pc_gucrc_disable in guc pc fini Matthew Brost
2024-08-20 18:02   ` Randhawa, Jagmeet
2024-08-20 17:29 ` [PATCH v2 4/6] drm/xe: Move hw_engine_fini to devm managed Matthew Brost
2024-08-20 20:48   ` Lucas De Marchi
2024-08-20 17:29 ` [PATCH v2 5/6] drm/xe: Move HuC init before GuC init Matthew Brost
2024-08-20 20:42   ` Lucas De Marchi
2024-08-20 21:02     ` Matthew Brost
2024-08-20 17:29 ` [PATCH v2 6/6] drm/xe: Update xe_sa to use xe_managed_bo_create_pin_map Matthew Brost
2024-08-20 21:07   ` Lucas De Marchi
2024-08-20 19:07 ` ✓ CI.Patch_applied: success for Driver load failure fixes Patchwork
2024-08-20 19:07 ` ✓ CI.checkpatch: " Patchwork
2024-08-20 19:09 ` ✓ CI.KUnit: " Patchwork
2024-08-20 19:20 ` ✓ CI.Build: " Patchwork
2024-08-20 19:23 ` ✓ CI.Hooks: " Patchwork
2024-08-20 19:24 ` ✓ CI.checksparse: " Patchwork
2024-08-20 19:46 ` ✗ CI.BAT: failure " Patchwork
2024-08-21  2:05 ` ✗ CI.FULL: " 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=20240820172958.1095143-3-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