[PATCH] uc-skip-reset-in-prep-reset

[Michał Winiarski]

---
 drivers/gpu/drm/i915/gt/intel_reset.c | 6 ++++--
 drivers/gpu/drm/i915/intel_uc.c       | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index adfdb908587f..dab48e85e421 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -538,6 +538,10 @@ static int gen8_reset_engines(struct drm_i915_private *i915,
 	intel_engine_mask_t tmp;
 	int ret;
 
+	/* We are about to do full GPU reset, don't forget about GuC */
+	if (engine_mask == ALL_ENGINES)
+		intel_uc_reset_prepare(i915);
+
 	for_each_engine_masked(engine, i915, engine_mask, tmp) {
 		ret = gen8_engine_reset_prepare(engine);
 		if (ret && !reset_non_ready)
@@ -720,8 +724,6 @@ static intel_engine_mask_t reset_prepare(struct drm_i915_private *i915)
 		reset_prepare_engine(engine);
 	}
 
-	intel_uc_reset_prepare(i915);
-
 	return awake;
 }
 
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index fdf00f1ebb57..b9ca1ce30213 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -457,8 +457,6 @@ static void __uc_sanitize(struct drm_i915_private *i915)
 
 	intel_huc_sanitize(huc);
 	intel_guc_sanitize(guc);
-
-	__intel_uc_reset_hw(i915);
 }
 
 void intel_uc_sanitize(struct drm_i915_private *i915)
-- 
2.21.0