From: "Chang, Bruce" <yu.bruce.chang@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [Intel-xe] [PATCH] drm/xe: don't auto fall back to execlist mode if guc failed to init
Date: Thu, 23 Mar 2023 20:23:13 +0000 [thread overview]
Message-ID: <20230323202313.3523-1-yu.bruce.chang@intel.com> (raw)
In general, this is due to FW load failure, should just report
error and fail the probe so that user can easily retry again.
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Bruce Chang <yu.bruce.chang@intel.com>
---
drivers/gpu/drm/xe/xe_gt.c | 4 ++--
drivers/gpu/drm/xe/xe_uc.c | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index daa433d0f2f5..8a436c95591e 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -455,9 +455,9 @@ static int gt_fw_domain_init(struct xe_gt *gt)
goto err_force_wake;
}
- /* Allow driver to load if uC init fails (likely missing firmware) */
err = xe_uc_init(>->uc);
- XE_WARN_ON(err);
+ if (err)
+ goto err_force_wake;
err = xe_uc_init_hwconfig(>->uc);
if (err)
diff --git a/drivers/gpu/drm/xe/xe_uc.c b/drivers/gpu/drm/xe/xe_uc.c
index 4ccf2b3435e1..70eabf567156 100644
--- a/drivers/gpu/drm/xe/xe_uc.c
+++ b/drivers/gpu/drm/xe/xe_uc.c
@@ -54,9 +54,6 @@ int xe_uc_init(struct xe_uc *uc)
return 0;
err:
- /* If any uC firmwares not found, fall back to execlists */
- xe_device_guc_submission_disable(uc_to_xe(uc));
-
return ret;
}
--
2.25.1
next reply other threads:[~2023-03-23 20:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 20:23 Chang, Bruce [this message]
2023-03-23 20:25 ` [Intel-xe] ✓ CI.Patch_applied: success for drm/xe: don't auto fall back to execlist mode if guc failed to init Patchwork
2023-03-23 20:26 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-03-23 20:30 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-03-23 20:52 ` [Intel-xe] ○ CI.BAT: info " Patchwork
2023-03-23 22:52 ` [Intel-xe] [PATCH] " Matthew Brost
2023-03-23 23:08 ` Chang, Yu bruce
2023-03-24 7:37 ` Mauro Carvalho Chehab
2023-03-24 15:15 ` Lucas De Marchi
2023-03-24 16:15 ` Rodrigo Vivi
2023-03-29 19:13 ` Rodrigo Vivi
2023-03-29 20:00 ` Chang, Yu bruce
2023-03-29 20:11 ` Rodrigo Vivi
2023-03-29 20:16 ` Chang, Yu bruce
2023-03-24 7:14 ` Lucas De Marchi
2023-03-24 15:57 ` Chang, Yu bruce
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=20230323202313.3523-1-yu.bruce.chang@intel.com \
--to=yu.bruce.chang@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;
as well as URLs for NNTP newsgroup(s).