summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorAndrew Lutomirski <luto@mit.edu>2009-12-21 10:10:22 -0500
committerEric Anholt <eric@anholt.net>2010-01-06 09:39:53 -0800
commit1d3c36ad4122651018599d4e3c9be0cccfbfb939 (patch)
treec7505143a7b2a1459d8a87c680461692927aec0f /drivers/gpu/drm/i915/i915_drv.h
parent76446cac68568fc7f5168a27deaf803ed22a4360 (diff)
downloadblackbird-op-linux-1d3c36ad4122651018599d4e3c9be0cccfbfb939.tar.gz
blackbird-op-linux-1d3c36ad4122651018599d4e3c9be0cccfbfb939.zip
drm/i915: Fix RC6 suspend/resume
We restored RC6 twice on resume, even with modesetting off. Instead, only restore it once and skip RC6 initialization entirely in non-KMS mode. Signed-off-by: Andy Lutomirski <luto@mit.edu> Tested-by: Jeff Chua <jeff.chua.linux@gmail.com> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 7eb4ad51034d..29dd67626967 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -307,8 +307,6 @@ typedef struct drm_i915_private {
u32 saveDSPACNTR;
u32 saveDSPBCNTR;
u32 saveDSPARB;
- u32 saveRENDERSTANDBY;
- u32 savePWRCTXA;
u32 saveHWS;
u32 savePIPEACONF;
u32 savePIPEBCONF;
OpenPOWER on IntegriCloud