diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-20 10:45:15 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-20 10:45:15 +0100 |
| commit | 5909a77ac62cc042f94bd262016cf468a2f96022 (patch) | |
| tree | 4f3bd217da99b0fc0351768c6748ac480a14362b /drivers/gpu/drm/i915/i915_suspend.c | |
| parent | drm/i915: Allow the application to choose the constant addressing mode (diff) | |
| download | linux-5909a77ac62cc042f94bd262016cf468a2f96022.tar.xz linux-5909a77ac62cc042f94bd262016cf468a2f96022.zip | |
drm/i915: Undo "Uncouple render/power ctx before suspending"
Manaul revert of 0cdab21f9a1fca50dd27e488839f5a6578e333b2, just to
remove the call to disable the clock gatings and powerctx before
suspend.
Peter Clifton bisected a suspend failure on his gme45 and found this to
be the culprit. As this was intended to be a fix for a similar suspend
failure for Ironlake (it didn't work), undoing this patch should have no
other side-effects.
Reported-and-tested-by: Peter Clifton <pcjc2@cam.ac.uk>
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index f623efdb1151..410772466fa7 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -822,7 +822,9 @@ 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); |