drm/i915/gt: perform uc late init after probe error injection
authorjsg <jsg@openbsd.org>
Fri, 31 Mar 2023 01:47:06 +0000 (01:47 +0000)
committerjsg <jsg@openbsd.org>
Fri, 31 Mar 2023 01:47:06 +0000 (01:47 +0000)
From Andrzej Hajda
6e516595e88670baf275701893fd43e0a454f7d0 in linux-6.1.y/6.1.22
150784f9285e656373cf3953ef4a7663f1e1a0f2 in mainline linux

sys/dev/pci/drm/i915/gt/intel_gt.c

index c58a09a..d44e11c 100644 (file)
@@ -695,12 +695,12 @@ int intel_gt_init(struct intel_gt *gt)
        if (err)
                goto err_gt;
 
-       intel_uc_init_late(&gt->uc);
-
        err = i915_inject_probe_error(gt->i915, -EIO);
        if (err)
                goto err_gt;
 
+       intel_uc_init_late(&gt->uc);
+
        intel_migrate_init(&gt->migrate, gt);
 
        intel_pxp_init(&gt->pxp);