Skip to content

Commit 150784f

Browse files
ahajdajnikula
authored andcommitted
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: 481d458 ("drm/i915/guc: Add golden context to GuC ADS") Acked-by: Nirmoy Das <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Signed-off-by: Andrzej Hajda <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit c4252a1) Signed-off-by: Jani Nikula <[email protected]>
1 parent e92eb24 commit 150784f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/i915/gt/intel_gt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -737,12 +737,12 @@ int intel_gt_init(struct intel_gt *gt)
737737
if (err)
738738
goto err_gt;
739739

740-
intel_uc_init_late(&gt->uc);
741-
742740
err = i915_inject_probe_error(gt->i915, -EIO);
743741
if (err)
744742
goto err_gt;
745743

744+
intel_uc_init_late(&gt->uc);
745+
746746
intel_migrate_init(&gt->migrate, gt);
747747

748748
goto out_fw;

0 commit comments

Comments
 (0)