In gt_sanitize we reset whole GPU (and indirectly uC).
Make sure we don't miss to run our dedicated uC sanitize code.
Signed-off-by: Michal Wajdeczko <michal.wajdec...@intel.com>
Cc: Chris Wilson <ch...@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 ++
drivers/gpu/drm/i915/i915_gem_pm.c | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index ae7155f0e063..af6bcc7eabf3 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -114,6 +114,8 @@ void intel_gt_sanitize(struct drm_i915_private *i915, bool
force)
if (!reset_engines(i915) && !force)
return;
+ intel_uc_sanitize(i915);
+
for_each_engine(engine, i915, id)
intel_engine_reset(engine, false);
}
diff --git a/drivers/gpu/drm/i915/i915_gem_pm.c
b/drivers/gpu/drm/i915/i915_gem_pm.c
index fa9c2ebd966a..af3a3def45d8 100644
--- a/drivers/gpu/drm/i915/i915_gem_pm.c
+++ b/drivers/gpu/drm/i915/i915_gem_pm.c
@@ -193,7 +193,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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
