diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-03-31 01:47:07 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-03-31 01:47:07 +0000 |
| commit | dc419ae770ae31d1ca03f9d84bd2807d10d1421c (patch) | |
| tree | 351433486caca41302ac27e39ba75cfb808fbba0 | |
| parent | 381ef7b8c1200aa3cf821481b9795db115afe463 (diff) | |
drm/i915/gt: perform uc late init after probe error injection
From Andrzej Hajda
6e516595e88670baf275701893fd43e0a454f7d0 in linux-6.1.y/6.1.22
150784f9285e656373cf3953ef4a7663f1e1a0f2 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/i915/gt/intel_gt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/gt/intel_gt.c b/sys/dev/pci/drm/i915/gt/intel_gt.c index c58a09a2f67..d44e11c2790 100644 --- a/sys/dev/pci/drm/i915/gt/intel_gt.c +++ b/sys/dev/pci/drm/i915/gt/intel_gt.c @@ -695,12 +695,12 @@ int intel_gt_init(struct intel_gt *gt) if (err) goto err_gt; - intel_uc_init_late(>->uc); - err = i915_inject_probe_error(gt->i915, -EIO); if (err) goto err_gt; + intel_uc_init_late(>->uc); + intel_migrate_init(>->migrate, gt); intel_pxp_init(>->pxp); |