Commit 33de290b authored by Chang, Bruce's avatar Chang, Bruce Committed by Rodrigo Vivi

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: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarBruce Chang <yu.bruce.chang@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 011d8fa3
...@@ -379,9 +379,9 @@ static int gt_fw_domain_init(struct xe_gt *gt) ...@@ -379,9 +379,9 @@ static int gt_fw_domain_init(struct xe_gt *gt)
goto err_force_wake; goto err_force_wake;
} }
/* Allow driver to load if uC init fails (likely missing firmware) */
err = xe_uc_init(&gt->uc); err = xe_uc_init(&gt->uc);
XE_WARN_ON(err); if (err)
goto err_force_wake;
err = xe_uc_init_hwconfig(&gt->uc); err = xe_uc_init_hwconfig(&gt->uc);
if (err) if (err)
......
...@@ -54,9 +54,6 @@ int xe_uc_init(struct xe_uc *uc) ...@@ -54,9 +54,6 @@ int xe_uc_init(struct xe_uc *uc)
return 0; return 0;
err: err:
/* If any uC firmwares not found, fall back to execlists */
xe_device_guc_submission_disable(uc_to_xe(uc));
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment