@@ -1710,8 +1710,6 @@ static int i915_drm_resume(struct drm_device *dev)
}
mutex_unlock(&dev->struct_mutex);
- intel_guc_resume(&dev_priv->guc);
-
intel_modeset_init_hw(dev);
spin_lock_irq(&dev_priv->irq_lock);
@@ -2520,8 +2518,6 @@ static int intel_runtime_suspend(struct device *kdev)
if (ret)
goto err_gem;
- intel_guc_suspend(&dev_priv->guc);
-
intel_runtime_pm_disable_interrupts(dev_priv);
ret = 0;
@@ -2582,7 +2578,6 @@ static int intel_runtime_suspend(struct device *kdev)
err_disable:
intel_runtime_pm_enable_interrupts(dev_priv);
- intel_guc_resume(&dev_priv->guc);
i915_gem_runtime_resume(dev_priv);
err_gem:
@@ -2610,8 +2605,6 @@ static int intel_runtime_resume(struct device *kdev)
if (intel_uncore_unclaimed_mmio(dev_priv))
DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");
- intel_guc_resume(&dev_priv->guc);
-
if (IS_GEN9_LP(dev_priv)) {
bxt_disable_dc9(dev_priv);
bxt_display_core_init(dev_priv, true);
@@ -2058,6 +2058,10 @@ int i915_gem_runtime_suspend(struct drm_i915_private *dev_priv)
struct drm_i915_gem_object *obj, *on;
int i;
+ mutex_lock(&dev_priv->drm.struct_mutex);
+
+ intel_guc_suspend(&dev_priv->guc);
+
/*
* Only called during RPM suspend. All users of the userfault_list
* must be holding an RPM wakeref to ensure that this can not
@@ -2094,13 +2098,21 @@ int i915_gem_runtime_suspend(struct drm_i915_private *dev_priv)
reg->dirty = true;
}
+ mutex_unlock(&dev_priv->drm.struct_mutex);
+
return 0;
}
void i915_gem_runtime_resume(struct drm_i915_private *dev_priv)
{
+ mutex_lock(&dev_priv->drm.struct_mutex);
+
i915_gem_init_swizzling(dev_priv);
i915_gem_restore_fences(dev_priv);
+
+ intel_guc_resume(&dev_priv->guc);
+
+ mutex_unlock(&dev_priv->drm.struct_mutex);
}
static int i915_gem_object_create_mmap_offset(struct drm_i915_gem_object *obj)
@@ -4653,8 +4665,6 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv)
i915_gem_contexts_lost(dev_priv);
mutex_unlock(&dev->struct_mutex);
- intel_guc_suspend(&dev_priv->guc);
-
cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
cancel_delayed_work_sync(&dev_priv->gt.retire_work);
@@ -4670,6 +4680,10 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv)
if (WARN_ON(!intel_engines_are_idle(dev_priv)))
i915_gem_set_wedged(dev_priv); /* no hope, discard everything */
+ mutex_lock(&dev->struct_mutex);
+ intel_guc_suspend(&dev_priv->guc);
+ mutex_unlock(&dev->struct_mutex);
+
/*
* Neither the BIOS, ourselves or any other kernel
* expects the system to be in execlists mode on startup,
@@ -4716,6 +4730,8 @@ void i915_gem_resume(struct drm_i915_private *dev_priv)
*/
dev_priv->gt.resume(dev_priv);
+ intel_guc_resume(&dev_priv->guc);
+
mutex_unlock(&dev->struct_mutex);
}
This patch moves GuC suspend/resume handlers to corresponding GEM handlers and orders them properly in the runtime and system suspend/resume flows. Also ensure all GEM suspend/resume paths are protected by struct_mutex. v2: Removed documentation of suspend/resume handlers as those are not interfaces and are just hooks. (Chris) v3: Rebase. Removed i915_gem_restore_fences change from this patch. (Michal Wajdeczko) v4: Rebase. Added struct_mutex protection to i915_gem_runtime_suspend, i915_gem_runtime_resume and intel_guc_suspend in i915_gem_suspend. Pulled intel_guc_resume under struct_mutex in i915_gem_resume. Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Imre Deak <imre.deak@intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Michał Winiarski <michal.winiarski@intel.com> --- drivers/gpu/drm/i915/i915_drv.c | 7 ------- drivers/gpu/drm/i915/i915_gem.c | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 9 deletions(-)