From: Daniele Ceraolo Spurio Date: Tue, 23 Jul 2019 09:14:04 +0000 (+0100) Subject: drm/i915/uc: Sanitize uC when GT is sanitized X-Git-Tag: v5.4-rc1~106^2~19^2~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de6a263400f232a3787bdb112d9c974ebd29c4b4;p=thirdparty%2Flinux.git 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: Daniele Ceraolo Spurio Cc: Michal Wajdeczko Cc: Chris Wilson Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20190723091404.6449-2-chris@chris-wilson.co.uk --- diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c index 8faf262278aeb..b5561cbdc5ea0 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 61ed912341f1d..65c0d0c9d5433 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;