Commit de6a2634 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson

drm/i915/uc: Sanitize uC when GT is sanitized

The microcontrollers are part of GT so it makes logical sense to have
them sanitized at the same time. This also fixed an issue with our
status tracking where the FW load status is not reset around
hibernation.
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190723091404.6449-2-chris@chris-wilson.co.uk
parent 3fcba881
...@@ -239,7 +239,6 @@ void i915_gem_suspend_late(struct drm_i915_private *i915) ...@@ -239,7 +239,6 @@ void i915_gem_suspend_late(struct drm_i915_private *i915)
} }
spin_unlock_irqrestore(&i915->mm.obj_lock, flags); spin_unlock_irqrestore(&i915->mm.obj_lock, flags);
intel_uc_sanitize(&i915->gt.uc);
i915_gem_sanitize(i915); i915_gem_sanitize(i915);
} }
......
...@@ -118,6 +118,8 @@ void intel_gt_sanitize(struct intel_gt *gt, bool force) ...@@ -118,6 +118,8 @@ void intel_gt_sanitize(struct intel_gt *gt, bool force)
GEM_TRACE("\n"); GEM_TRACE("\n");
intel_uc_sanitize(&gt->uc);
if (!reset_engines(gt) && !force) if (!reset_engines(gt) && !force)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment