[PATCH 10/21] drm/i915/guc: Update GEM suspend/resume flows with GuC suspend/resume functions

[Sagar Arun Kamble]

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 guc suspend in drm suspend is 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.

v5: Removed struct_mutex protection from gem_runtime_suspend/resume as
callers already are holding this lock.

v6: Rebase due to change in the patch order.

Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Imre Deak <imre.deak at intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: Michał Winiarski <michal.winiarski at intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c |  7 -------
 drivers/gpu/drm/i915/i915_gem.c | 12 ++++++++++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index ee5ba35..a61213d 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1713,8 +1713,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);
@@ -2523,8 +2521,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;
@@ -2585,7 +2581,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:
@@ -2613,8 +2608,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);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index bc149a2..4fbd02b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2059,6 +2059,8 @@ int i915_gem_runtime_suspend(struct drm_i915_private *dev_priv)
 	struct drm_i915_gem_object *obj, *on;
 	int i;
 
+	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
@@ -2102,6 +2104,8 @@ void i915_gem_runtime_resume(struct drm_i915_private *dev_priv)
 {
 	i915_gem_init_swizzling(dev_priv);
 	i915_gem_restore_fences(dev_priv);
+
+	intel_guc_resume(&dev_priv->guc);
 }
 
 static int i915_gem_object_create_mmap_offset(struct drm_i915_gem_object *obj)
@@ -4675,8 +4679,6 @@ int i915_gem_quiesce(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);
 
@@ -4692,6 +4694,10 @@ int i915_gem_quiesce(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);
+
 	intel_runtime_pm_put(dev_priv);
 	return 0;
 
@@ -4754,6 +4760,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);
 }
 
-- 
1.9.1