Commit 150784f9 authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Jani Nikula

drm/i915/gt: perform uc late init after probe error injection

Probe pseudo errors should be injected only in places where real errors
can be encountered, otherwise unwinding code can be broken.
Placing intel_uc_init_late before i915_inject_probe_error violated
this rule, resulting in following bug:
__intel_gt_disable:655 GEM_BUG_ON(intel_gt_pm_is_awake(gt))

Fixes: 481d458c ("drm/i915/guc: Add golden context to GuC ADS")
Acked-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230314151920.1065847-1-andrzej.hajda@intel.com
(cherry picked from commit c4252a11)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent e92eb246
...@@ -737,12 +737,12 @@ int intel_gt_init(struct intel_gt *gt) ...@@ -737,12 +737,12 @@ int intel_gt_init(struct intel_gt *gt)
if (err) if (err)
goto err_gt; goto err_gt;
intel_uc_init_late(&gt->uc);
err = i915_inject_probe_error(gt->i915, -EIO); err = i915_inject_probe_error(gt->i915, -EIO);
if (err) if (err)
goto err_gt; goto err_gt;
intel_uc_init_late(&gt->uc);
intel_migrate_init(&gt->migrate, gt); intel_migrate_init(&gt->migrate, gt);
goto out_fw; goto out_fw;
......
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