From: Nirmoy Das <nirmoy.das@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: matthew.d.roper@intel.com, dri-devel@lists.freedesktop.org,
Nirmoy Das <nirmoy.das@intel.com>
Subject: [Intel-gfx] [PATCH v7 2/4] drm/i915: Introduce the intel_gt_resume_early()
Date: Thu, 28 Sep 2023 15:00:13 +0200 [thread overview]
Message-ID: <20230928130015.6758-2-nirmoy.das@intel.com> (raw)
In-Reply-To: <20230928130015.6758-1-nirmoy.das@intel.com>
Move early resume functions of gt to a proper file.
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
drivers/gpu/drm/i915/gt/intel_gt_pm.c | 6 ++++++
drivers/gpu/drm/i915/gt/intel_gt_pm.h | 1 +
drivers/gpu/drm/i915/i915_driver.c | 6 ++----
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index 5a942af0a14e..dab73980c9f1 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -216,6 +216,12 @@ void intel_gt_pm_fini(struct intel_gt *gt)
intel_rc6_fini(>->rc6);
}
+void intel_gt_resume_early(struct intel_gt *gt)
+{
+ intel_uncore_resume_early(gt->uncore);
+ intel_gt_check_and_clear_faults(gt);
+}
+
int intel_gt_resume(struct intel_gt *gt)
{
struct intel_engine_cs *engine;
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.h b/drivers/gpu/drm/i915/gt/intel_gt_pm.h
index 6c9a46452364..b1eeb5b33918 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.h
@@ -78,6 +78,7 @@ void intel_gt_pm_fini(struct intel_gt *gt);
void intel_gt_suspend_prepare(struct intel_gt *gt);
void intel_gt_suspend_late(struct intel_gt *gt);
int intel_gt_resume(struct intel_gt *gt);
+void intel_gt_resume_early(struct intel_gt *gt);
void intel_gt_runtime_suspend(struct intel_gt *gt);
int intel_gt_runtime_resume(struct intel_gt *gt);
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index d50347e5773a..78501a83ba10 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1327,10 +1327,8 @@ static int i915_drm_resume_early(struct drm_device *dev)
drm_err(&dev_priv->drm,
"Resume prepare failed: %d, continuing anyway\n", ret);
- for_each_gt(gt, dev_priv, i) {
- intel_uncore_resume_early(gt->uncore);
- intel_gt_check_and_clear_faults(gt);
- }
+ for_each_gt(gt, dev_priv, i)
+ intel_gt_resume_early(gt);
intel_display_power_resume_early(dev_priv);
--
2.41.0
next prev parent reply other threads:[~2023-09-28 13:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-28 13:00 [Intel-gfx] [PATCH v7 1/4] drm/i915: Introduce intel_gt_mcr_lock_sanitize() Nirmoy Das
2023-09-28 13:00 ` Nirmoy Das [this message]
2023-09-28 13:28 ` [Intel-gfx] [PATCH v7 2/4] drm/i915: Introduce the intel_gt_resume_early() Andi Shyti
2023-09-28 21:43 ` Andrzej Hajda
2023-09-28 13:00 ` [Intel-gfx] [PATCH v7 3/4] drm/i915: Clean steer semaphore on resume Nirmoy Das
2023-09-28 13:00 ` [Intel-gfx] [PATCH v7 4/4] drm/i915/mtl: Skip MCR ops for ring fault register Nirmoy Das
2023-09-28 22:14 ` Andrzej Hajda
2023-09-28 22:33 ` Matt Roper
2023-09-28 13:27 ` [Intel-gfx] [PATCH v7 1/4] drm/i915: Introduce intel_gt_mcr_lock_sanitize() Andi Shyti
2023-09-28 13:43 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [v7,1/4] " Patchwork
2023-09-28 14:01 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-09-28 16:54 ` [Intel-gfx] [PATCH v7 1/4] " Matt Roper
2023-09-28 18:16 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [v7,1/4] drm/i915: Introduce intel_gt_mcr_lock_sanitize() (rev2) Patchwork
2023-09-28 18:26 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-09-28 21:42 ` [Intel-gfx] [PATCH v7 1/4] drm/i915: Introduce intel_gt_mcr_lock_sanitize() Andrzej Hajda
2023-09-29 8:40 ` Nirmoy Das
2023-09-29 4:51 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [v7,1/4] drm/i915: Introduce intel_gt_mcr_lock_sanitize() (rev2) Patchwork
2023-09-29 8:37 ` [Intel-gfx] [PATCH v7 1/4] drm/i915: Introduce intel_gt_mcr_lock_sanitize() Nirmoy Das
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=20230928130015.6758-2-nirmoy.das@intel.com \
--to=nirmoy.das@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.d.roper@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox