[RFC v3 5/7] drm/i915/uc: Always sanitize uC when sanitizing GEM

[Michal Wajdeczko]

WIP

Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index a4435a807e83..4490950d3d26 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4899,6 +4899,8 @@ void i915_gem_sanitize(struct drm_i915_private *i915)
 	if (i915_terminally_wedged(&i915->gpu_error))
 		i915_gem_unset_wedged(i915);
 
+	intel_uc_sanitize(i915);
+
 	/*
 	 * If we inherit context state from the BIOS or earlier occupants
 	 * of the GPU, the GPU may be in an inconsistent state when we
@@ -5019,7 +5021,6 @@ void i915_gem_suspend_late(struct drm_i915_private *i915)
 	}
 	mutex_unlock(&i915->drm.struct_mutex);
 
-	intel_uc_sanitize(i915);
 	i915_gem_sanitize(i915);
 }
 
-- 
2.19.2