From: Ben Widawsky <ben@bwidawsk.net>
To: intel-gfx@lists.freedesktop.org
Cc: Ben Widawsky <ben@bwidawsk.net>
Subject: [PATCH 4/7] drm/i915: PCH_NOP suspend/resume
Date: Fri, 5 Apr 2013 13:12:42 -0700 [thread overview]
Message-ID: <1365192765-3485-4-git-send-email-ben@bwidawsk.net> (raw)
In-Reply-To: <1365192765-3485-1-git-send-email-ben@bwidawsk.net>
More registers we can't write.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
drivers/gpu/drm/i915/i915_suspend.c | 58 +++++++++++++++++++++++++++----------
1 file changed, 42 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 41f0fde..7f58c82 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -334,11 +334,19 @@ int i915_save_state(struct drm_device *dev)
mutex_lock(&dev->struct_mutex);
- i915_save_display(dev);
+ if (!HAS_PCH_NOP(dev))
+ i915_save_display(dev);
if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
/* Interrupt state */
- if (HAS_PCH_SPLIT(dev)) {
+ if (HAS_PCH_NOP(dev)) {
+ dev_priv->regfile.saveDEIER = I915_READ(DEIER);
+ dev_priv->regfile.saveDEIMR = I915_READ(DEIMR);
+ dev_priv->regfile.saveGTIER = I915_READ(GTIER);
+ dev_priv->regfile.saveGTIMR = I915_READ(GTIMR);
+ dev_priv->regfile.saveMCHBAR_RENDER_STANDBY =
+ I915_READ(RSTDBYCTL);
+ } else if (HAS_PCH_SPLIT(dev)) {
dev_priv->regfile.saveDEIER = I915_READ(DEIER);
dev_priv->regfile.saveDEIMR = I915_READ(DEIMR);
dev_priv->regfile.saveGTIER = I915_READ(GTIER);
@@ -362,13 +370,19 @@ int i915_save_state(struct drm_device *dev)
/* Memory Arbitration state */
dev_priv->regfile.saveMI_ARB_STATE = I915_READ(MI_ARB_STATE);
- /* Scratch space */
- for (i = 0; i < 16; i++) {
- dev_priv->regfile.saveSWF0[i] = I915_READ(SWF00 + (i << 2));
- dev_priv->regfile.saveSWF1[i] = I915_READ(SWF10 + (i << 2));
+ if (!HAS_PCH_NOP(dev)) {
+ /* Scratch space
+ * XXX: Do we really need this for kms? */
+ for (i = 0; i < 16; i++) {
+ dev_priv->regfile.saveSWF0[i] =
+ I915_READ(SWF00 + (i << 2));
+ dev_priv->regfile.saveSWF1[i] =
+ I915_READ(SWF10 + (i << 2));
+ }
+ for (i = 0; i < 3; i++)
+ dev_priv->regfile.saveSWF2[i] =
+ I915_READ(SWF30 + (i << 2));
}
- for (i = 0; i < 3; i++)
- dev_priv->regfile.saveSWF2[i] = I915_READ(SWF30 + (i << 2));
mutex_unlock(&dev->struct_mutex);
@@ -384,11 +398,17 @@ int i915_restore_state(struct drm_device *dev)
mutex_lock(&dev->struct_mutex);
- i915_restore_display(dev);
+ if (!HAS_PCH_NOP(dev))
+ i915_restore_display(dev);
if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
/* Interrupt state */
- if (HAS_PCH_SPLIT(dev)) {
+ if (HAS_PCH_NOP(dev)) {
+ I915_WRITE(DEIER, dev_priv->regfile.saveDEIER);
+ I915_WRITE(DEIMR, dev_priv->regfile.saveDEIMR);
+ I915_WRITE(GTIER, dev_priv->regfile.saveGTIER);
+ I915_WRITE(GTIMR, dev_priv->regfile.saveGTIMR);
+ } else if (HAS_PCH_SPLIT(dev)) {
I915_WRITE(DEIER, dev_priv->regfile.saveDEIER);
I915_WRITE(DEIMR, dev_priv->regfile.saveDEIMR);
I915_WRITE(GTIER, dev_priv->regfile.saveGTIER);
@@ -408,16 +428,22 @@ int i915_restore_state(struct drm_device *dev)
/* Memory arbitration state */
I915_WRITE(MI_ARB_STATE, dev_priv->regfile.saveMI_ARB_STATE | 0xffff0000);
- for (i = 0; i < 16; i++) {
- I915_WRITE(SWF00 + (i << 2), dev_priv->regfile.saveSWF0[i]);
- I915_WRITE(SWF10 + (i << 2), dev_priv->regfile.saveSWF1[i]);
+ if (!HAS_PCH_NOP(dev)) {
+ for (i = 0; i < 16; i++) {
+ I915_WRITE(SWF00 + (i << 2),
+ dev_priv->regfile.saveSWF0[i]);
+ I915_WRITE(SWF10 + (i << 2),
+ dev_priv->regfile.saveSWF1[i]);
+ }
+ for (i = 0; i < 3; i++)
+ I915_WRITE(SWF30 + (i << 2),
+ dev_priv->regfile.saveSWF2[i]);
}
- for (i = 0; i < 3; i++)
- I915_WRITE(SWF30 + (i << 2), dev_priv->regfile.saveSWF2[i]);
mutex_unlock(&dev->struct_mutex);
- intel_i2c_reset(dev);
+ if (!HAS_PCH_NOP(dev))
+ intel_i2c_reset(dev);
return 0;
}
--
1.8.2
next prev parent reply other threads:[~2013-04-05 20:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-05 20:12 [PATCH 1/7] drm/i915: Support PCH no display Ben Widawsky
2013-04-05 20:12 ` [PATCH 2/7] drm/i915: PCH_NOP Ben Widawsky
2013-04-05 20:12 ` [PATCH 3/7] drm/i915: Don't touch South Display when PCH_NOP Ben Widawsky
2013-04-05 20:12 ` Ben Widawsky [this message]
2013-04-06 17:41 ` [PATCH 4/7] drm/i915: PCH_NOP suspend/resume Daniel Vetter
2013-04-08 18:57 ` Daniel Vetter
2013-04-05 20:12 ` [PATCH 5/7] drm/i915: Don't wait for PCH on reset Ben Widawsky
2013-04-05 20:12 ` [PATCH 6/7] drm/i915: Set PCH_NOP Ben Widawsky
2013-04-05 20:12 ` [PATCH 7/7] drm/i915: Add a pipeless ivybridge configuration Ben Widawsky
2013-04-06 17:42 ` 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=1365192765-3485-4-git-send-email-ben@bwidawsk.net \
--to=ben@bwidawsk.net \
--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