diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-01-05 12:01:26 -0800 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-11 20:43:59 +0000 |
| commit | d5bb081b027b520f9e59b4fb8faea83a136ec15e (patch) | |
| tree | 5ff85d01f3763d0e4be1ae7934ef673db2b9c604 /drivers/gpu/drm/i915/i915_suspend.c | |
| parent | 1daed3fb8324d517a1f9da43f1a1d3619d1b0ddc (diff) | |
| download | kernel_samsung_smdk4412-d5bb081b027b520f9e59b4fb8faea83a136ec15e.zip kernel_samsung_smdk4412-d5bb081b027b520f9e59b4fb8faea83a136ec15e.tar.gz kernel_samsung_smdk4412-d5bb081b027b520f9e59b4fb8faea83a136ec15e.tar.bz2 | |
drm/i915: cleanup rc6 code
Cleanup several aspects of the rc6 code:
- misnamed intel_disable_clock_gating function (was only about rc6)
- remove commented call to intel_disable_clock_gating
- rc6 enabling code belongs in its own function (allows us to move the
actual clock gating enable call back into restore_state)
- allocate power & render contexts up front, only free on unload
(avoids ugly lazy init at rc6 enable time)
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
[ickle: checkpatch cleanup]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 147cd96..0521ecf2 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -822,10 +822,6 @@ int i915_save_state(struct drm_device *dev) if (IS_GEN6(dev)) gen6_disable_rps(dev); - /* XXX disabling the clock gating breaks suspend on gm45 - intel_disable_clock_gating(dev); - */ - /* Cache mode state */ dev_priv->saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0); @@ -868,6 +864,9 @@ int i915_restore_state(struct drm_device *dev) I915_WRITE (IMR, dev_priv->saveIMR); } + /* Clock gating state */ + intel_enable_clock_gating(dev); + if (IS_IRONLAKE_M(dev)) { ironlake_enable_drps(dev); intel_init_emon(dev); |