[RFC v5 1/8] drm/i915/uc: Explicitly sanitize GuC/HuC on failure and finish

[Michal Wajdeczko]

WIP

Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
---
 drivers/gpu/drm/i915/intel_uc.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 731b82afe636..27fd85c31436 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -50,6 +50,19 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv)
 	return ret;
 }
 
+static void __uc_sanitize(struct drm_i915_private *i915)
+{
+	struct intel_guc *guc = &i915->guc;
+	struct intel_huc *huc = &i915->huc;
+
+	GEM_BUG_ON(!HAS_GUC(i915));
+
+	intel_huc_sanitize(huc);
+	intel_guc_sanitize(guc);
+
+	__intel_uc_reset_hw(i915);
+}
+
 static int __get_platform_enable_guc(struct drm_i915_private *i915)
 {
 	struct intel_uc_fw *guc_fw = &i915->guc.fw;
@@ -324,7 +337,6 @@ void intel_uc_fini(struct drm_i915_private *i915)
 void intel_uc_sanitize(struct drm_i915_private *i915)
 {
 	struct intel_guc *guc = &i915->guc;
-	struct intel_huc *huc = &i915->huc;
 
 	if (!USES_GUC(i915))
 		return;
@@ -333,10 +345,7 @@ void intel_uc_sanitize(struct drm_i915_private *i915)
 
 	guc_disable_communication(guc);
 
-	intel_huc_sanitize(huc);
-	intel_guc_sanitize(guc);
-
-	__intel_uc_reset_hw(i915);
+	__uc_sanitize(i915);
 }
 
 int intel_uc_init_hw(struct drm_i915_private *i915)
@@ -424,6 +433,8 @@ int intel_uc_init_hw(struct drm_i915_private *i915)
 err_log_capture:
 	guc_capture_load_err_log(guc);
 err_out:
+	__uc_sanitize(i915);
+
 	/*
 	 * Note that there is no fallback as either user explicitly asked for
 	 * the GuC or driver default option was to run with the GuC enabled.
@@ -448,6 +459,8 @@ void intel_uc_fini_hw(struct drm_i915_private *i915)
 		intel_guc_submission_disable(guc);
 
 	guc_disable_communication(guc);
+
+	__uc_sanitize(i915);
 }
 
 int intel_uc_suspend(struct drm_i915_private *i915)
-- 
2.19.2