All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 4/6] drm/i915/gt: introduce intel_gt_runtime_suspend/resume
Date: Mon, 29 Jul 2019 16:47:25 -0700	[thread overview]
Message-ID: <20190729234727.28286-5-daniele.ceraolospurio@intel.com> (raw)
In-Reply-To: <20190729234727.28286-1-daniele.ceraolospurio@intel.com>

To be called from the top level runtime functions, to hide the
gt-specific bits (mainly related to intel_uc).

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
---
 drivers/gpu/drm/i915/gt/intel_gt_pm.c | 12 ++++++++++++
 drivers/gpu/drm/i915/gt/intel_gt_pm.h |  2 ++
 drivers/gpu/drm/i915/i915_drv.c       |  9 +++------
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index 65c0d0c9d543..1a32e3e523c0 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -164,3 +164,15 @@ int intel_gt_resume(struct intel_gt *gt)
 
 	return err;
 }
+
+void intel_gt_runtime_suspend(struct intel_gt *gt)
+{
+	intel_uc_runtime_suspend(&gt->uc);
+}
+
+int intel_gt_runtime_resume(struct intel_gt *gt)
+{
+	intel_gt_init_swizzling(gt);
+
+	return intel_uc_resume(&gt->uc);
+}
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.h b/drivers/gpu/drm/i915/gt/intel_gt_pm.h
index ba960e1fc209..527894fe1345 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.h
@@ -23,5 +23,7 @@ void intel_gt_pm_init_early(struct intel_gt *gt);
 
 void intel_gt_sanitize(struct intel_gt *gt, bool force);
 int intel_gt_resume(struct intel_gt *gt);
+void intel_gt_runtime_suspend(struct intel_gt *gt);
+int intel_gt_runtime_resume(struct intel_gt *gt);
 
 #endif /* INTEL_GT_PM_H */
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 3cd3be69dbad..bc7ffda10e5c 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2925,7 +2925,7 @@ static int intel_runtime_suspend(struct device *kdev)
 	 */
 	i915_gem_runtime_suspend(dev_priv);
 
-	intel_uc_runtime_suspend(&dev_priv->gt.uc);
+	intel_gt_runtime_suspend(&dev_priv->gt);
 
 	intel_runtime_pm_disable_interrupts(dev_priv);
 
@@ -2950,9 +2950,8 @@ static int intel_runtime_suspend(struct device *kdev)
 
 		intel_runtime_pm_enable_interrupts(dev_priv);
 
-		intel_uc_resume(&dev_priv->gt.uc);
+		intel_gt_runtime_resume(&dev_priv->gt);
 
-		intel_gt_init_swizzling(&dev_priv->gt);
 		i915_gem_restore_fences(dev_priv);
 
 		enable_rpm_wakeref_asserts(rpm);
@@ -3047,13 +3046,11 @@ static int intel_runtime_resume(struct device *kdev)
 
 	intel_runtime_pm_enable_interrupts(dev_priv);
 
-	intel_uc_resume(&dev_priv->gt.uc);
-
 	/*
 	 * No point of rolling back things in case of an error, as the best
 	 * we can do is to hope that things will still work (and disable RPM).
 	 */
-	intel_gt_init_swizzling(&dev_priv->gt);
+	intel_gt_runtime_resume(&dev_priv->gt);
 	i915_gem_restore_fences(dev_priv);
 
 	/*
-- 
2.22.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-07-29 23:47 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-29 23:47 [PATCH 0/6] Call uC functions from GT ones Daniele Ceraolo Spurio
2019-07-29 23:47 ` [PATCH 1/6] drm/i915/uc: move uC WOPCM setup in uc_init_hw Daniele Ceraolo Spurio
2019-07-30 14:39   ` Michal Wajdeczko
2019-07-30 21:04     ` Daniele Ceraolo Spurio
2019-07-30 20:24   ` kbuild test robot
2019-07-30 20:24   ` [RFC PATCH] drm/i915/uc: uc_wopcm_init_hw() can be static kbuild test robot
2019-07-29 23:47 ` [PATCH 2/6] drm/i915: move gt_cleanup_early out of gem_cleanup_early Daniele Ceraolo Spurio
2019-07-30  7:19   ` Tvrtko Ursulin
2019-07-30  8:01     ` Chris Wilson
2019-07-30 14:56       ` Daniele Ceraolo Spurio
2019-07-30 15:12         ` Chris Wilson
2019-07-29 23:47 ` [PATCH 3/6] drm/i915/uc: move uc early functions inside the gt ones Daniele Ceraolo Spurio
2019-07-30 14:53   ` Michal Wajdeczko
2019-07-29 23:47 ` Daniele Ceraolo Spurio [this message]
2019-07-30  7:35   ` [PATCH 4/6] drm/i915/gt: introduce intel_gt_runtime_suspend/resume Tvrtko Ursulin
2019-07-29 23:47 ` [PATCH 5/6] drm/i915/uc: move uc_resume under gt_resume Daniele Ceraolo Spurio
2019-07-30  8:09   ` Chris Wilson
2019-07-29 23:47 ` [PATCH 6/6] drm/i915/gt: introduce intel_gt_suspend Daniele Ceraolo Spurio
2019-07-30  7:33   ` Tvrtko Ursulin
2019-07-30  8:12     ` Chris Wilson
2019-07-30 14:58       ` Daniele Ceraolo Spurio
2019-07-30  0:44 ` ✗ Fi.CI.SPARSE: warning for Call uC functions from GT ones Patchwork
2019-07-30  1:03 ` ✓ Fi.CI.BAT: success " Patchwork
2019-07-30 12:20 ` ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190729234727.28286-5-daniele.ceraolospurio@intel.com \
    --to=daniele.ceraolospurio@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.