From e0f86922e47d04f8341516ccedcc32321067729e Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Fri, 31 Mar 2023 01:47:06 +0000
Subject: [PATCH] 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
---
 sys/dev/pci/drm/i915/gt/intel_gt.c | 4 ++--
 1 file 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(&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);
-- 
2.20.1