From 2bf8f26026a35cf4a24d3609f70d1fb166c4183e Mon Sep 17 00:00:00 2001 From: "Chang, Bruce" <yu.bruce.chang@intel.com> Date: Thu, 23 Mar 2023 19:38:58 +0000 Subject: [PATCH] drm/xe: don't auto fall back to execlist mode if guc failed to init In general, this is due to FW load failure, should just report error and fail the probe so that user can easily retry again. Reviewed-by: Matthew Brost <matthew.brost@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 245117e67e9b..6322e0689a9e 100644 --- a/drivers/gpu/drm/xe/xe_gt.c +++ b/drivers/gpu/drm/xe/xe_gt.c @@ -379,9 +379,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; } -- GitLab