public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: deepak.s@linux.intel.com
To: intel-gfx@lists.freedesktop.org
Cc: daniel.vetter@ffwll.ch
Subject: [PATCH 4/4] drm/i915: Skip gunit save/restore for cherryview
Date: Fri, 12 Dec 2014 14:18:16 +0530	[thread overview]
Message-ID: <1418374096-26561-4-git-send-email-deepak.s@linux.intel.com> (raw)
In-Reply-To: <1418374096-26561-1-git-send-email-deepak.s@linux.intel.com>

From: Deepak S <deepak.s@linux.intel.com>

With cherryview onwards, Gunit hardware itself save and restore all the
Gunit registers. Skipping the "vlv_save_gunit_s0ix_state" &
"vlv_restore_gunit_s0ix_state" for cherryview in S3/S0ix sequence.

Signed-off-by: Deepak S <deepak.s@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 6c09bf8..6257f66 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1299,7 +1299,9 @@ static int vlv_suspend_complete(struct drm_i915_private *dev_priv)
 	err = vlv_allow_gt_wake(dev_priv, false);
 	if (err)
 		goto err2;
-	vlv_save_gunit_s0ix_state(dev_priv);
+
+	if (!IS_CHERRYVIEW(dev_priv->dev))
+		vlv_save_gunit_s0ix_state(dev_priv);
 
 	err = vlv_force_gfx_clock(dev_priv, false);
 	if (err)
@@ -1330,7 +1332,8 @@ static int vlv_resume_prepare(struct drm_i915_private *dev_priv,
 	 */
 	ret = vlv_force_gfx_clock(dev_priv, true);
 
-	vlv_restore_gunit_s0ix_state(dev_priv);
+	if (!IS_CHERRYVIEW(dev_priv->dev))
+		vlv_restore_gunit_s0ix_state(dev_priv);
 
 	err = vlv_allow_gt_wake(dev_priv, true);
 	if (!ret)
-- 
1.9.1

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

  parent reply	other threads:[~2014-12-11  8:51 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-12  8:48 [PATCH 1/4] drm/i915/chv: Use timeout mode for RC6 on chv deepak.s
2014-12-12  8:48 ` [PATCH 2/4] drm/i915/chv: Populate total EU count on Cherryview deepak.s
2014-12-11 12:09   ` Jani Nikula
2014-12-12 12:10     ` Deepak S
2014-12-12 12:33       ` [PATCH v2] " deepak.s
2014-12-12  8:48 ` [PATCH 3/4] drm/i915: New offset for reading frequencies on CHV deepak.s
2014-12-12 19:09   ` Ville Syrjälä
2014-12-15  6:51     ` Jani Nikula
2014-12-16 12:11       ` Deepak S
2015-01-16 15:12         ` [PATCH v2 0/3] Use new turbo offset for chv production system deepak.s
2015-01-16 15:12           ` [PATCH v2 1/3] drm/i915/chv: Populate total EU count on Cherryview deepak.s
2015-01-16 16:06             ` Jeff McGee
2015-01-16 17:11             ` Ville Syrjälä
2015-01-19  9:44             ` Daniel Vetter
2015-01-20  3:07               ` Deepak S
2015-01-20  9:06                 ` Daniel Vetter
2015-01-16 15:12           ` [PATCH v2 2/3] drm/i915: Increase the range of sideband address deepak.s
2015-01-16 17:11             ` Ville Syrjälä
2015-01-16 15:12           ` [PATCH v2 3/3] drm/i915: New offset for reading frequencies on CHV deepak.s
2015-01-16 17:09             ` Ville Syrjälä
2015-01-17  5:34               ` Deepak S
2015-01-17  5:35                 ` [PATCH v3] " deepak.s
2015-01-19  9:47                   ` Daniel Vetter
2014-12-12  8:48 ` deepak.s [this message]
2014-12-11 12:02   ` [PATCH 4/4] drm/i915: Skip gunit save/restore for cherryview Ville Syrjälä
2014-12-15 15:16     ` Daniel Vetter
2014-12-13  6:13 ` [PATCH v2] drm/i915/chv: Use timeout mode for RC6 on chv deepak.s
2014-12-12 16:34   ` Ville Syrjälä
2014-12-16 12:09     ` Deepak S
2014-12-15 15:12       ` Daniel Vetter

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=1418374096-26561-4-git-send-email-deepak.s@linux.intel.com \
    --to=deepak.s@linux.intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox