Skip to content

Commit

Permalink
drm/i915: Undo "Uncouple render/power ctx before suspending"
Browse files Browse the repository at this point in the history
Manaul revert of 0cdab21, 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>
  • Loading branch information
Chris Wilson committed Dec 20, 2010
1 parent 72bfa19 commit 5909a77
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/i915_suspend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 5909a77

Please sign in to comment.