]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915/gt: perform uc late init after probe error injection
authorAndrzej Hajda <andrzej.hajda@intel.com>
Tue, 14 Mar 2023 15:19:20 +0000 (16:19 +0100)
committerRoxana Nicolescu <roxana.nicolescu@canonical.com>
Wed, 17 May 2023 11:33:29 +0000 (13:33 +0200)
commit5e7898243f40c5fc3c8581d77b4566c710c02c6b
treee4611b03a6d4e3f3493969a106d28d2483fe3c83
parent283688df02f19d06056131066258177b4787eeb4
drm/i915/gt: perform uc late init after probe error injection

BugLink: https://bugs.launchpad.net/bugs/2016877
[ Upstream commit 150784f9285e656373cf3953ef4a7663f1e1a0f2 ]

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: 481d458caede ("drm/i915/guc: Add golden context to GuC ADS")
Acked-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230314151920.1065847-1-andrzej.hajda@intel.com
(cherry picked from commit c4252a11131c7f27a158294241466e2a4e7ff94e)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/gpu/drm/i915/gt/intel_gt.c