All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sujaritha Sundaresan <sujaritha.sundaresan@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Sujaritha Sundaresan <sujaritha.sundaresan@intel.com>
Subject: [PATCH] drm/i915/guc: GuC suspend path cleanup
Date: Thu, 21 Mar 2019 10:14:00 -0700	[thread overview]
Message-ID: <20190321171400.31900-1-sujaritha.sundaresan@intel.com> (raw)

Adding a call to intel_uc_suspend in i915_gem_suspend, which
is a common point for the suspend/resume and hibernate paths.
This fixes an unbalanced call that causes issues with the CTB
register/deregister.

Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Sujaritha Sundaresan <sujaritha.sundaresan@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 1a684b7e8c09..980855ebdeda 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4371,6 +4371,9 @@ void i915_gem_suspend(struct drm_i915_private *i915)
 	 */
 	switch_to_kernel_context_sync(i915, i915->gt.active_engines);
 
+	if (!__i915_wedged(&i915->gpu_error))
+		intel_uc_suspend(i915);
+
 	mutex_unlock(&i915->drm.struct_mutex);
 	i915_reset_flush(i915);
 
-- 
2.20.1

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

             reply	other threads:[~2019-03-21 17:32 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-21 17:14 Sujaritha Sundaresan [this message]
2019-03-21 17:49 ` [PATCH] drm/i915/guc: GuC suspend path cleanup Daniele Ceraolo Spurio
2019-03-21 17:54   ` Chris Wilson
2019-03-21 19:46     ` Sujaritha
2019-03-21 19:26 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-03-21 19:37   ` Chris Wilson
2019-03-21 19:41     ` Sujaritha
2019-03-21 20:08       ` Chris Wilson
2019-03-21 20:02         ` Sujaritha
2019-03-21 20:23           ` Chris Wilson
2019-03-21 20:28             ` Sujaritha
2019-03-21 20:38 ` [PATCH v2] " Sujaritha Sundaresan
2019-03-22  8:57   ` Chris Wilson
2019-03-22  9:39     ` Chris Wilson
2019-03-22  0:28 ` ✓ Fi.CI.BAT: success for drm/i915/guc: GuC suspend path cleanup (rev2) Patchwork
2019-03-22 18:12 ` ✓ 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=20190321171400.31900-1-sujaritha.sundaresan@intel.com \
    --to=sujaritha.sundaresan@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.