Message ID | 20190722232048.9970-5-daniele.ceraolospurio@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | uC fw path unification + misc clean-up | expand |
Quoting Daniele Ceraolo Spurio (2019-07-23 00:20:43) > 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: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> I like the sentiment, Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> I just want this is CI'ed by itself to be sure as S4-devices always catches me off guard :) -Chris
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c index 8faf262278ae..b5561cbdc5ea 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c @@ -239,7 +239,6 @@ void i915_gem_suspend_late(struct drm_i915_private *i915) } spin_unlock_irqrestore(&i915->mm.obj_lock, flags); - intel_uc_sanitize(&i915->gt.uc); i915_gem_sanitize(i915); } diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c index 61ed912341f1..65c0d0c9d543 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c @@ -118,6 +118,8 @@ void intel_gt_sanitize(struct intel_gt *gt, bool force) GEM_TRACE("\n"); + intel_uc_sanitize(>->uc); + if (!reset_engines(gt) && !force) return;
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: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/gem/i915_gem_pm.c | 1 - drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)