diff options
| author | Eric Anholt <eric@anholt.net> | 2012-01-23 16:14:06 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-01-24 13:25:10 -0800 |
| commit | 04115a9dee110b52a8eaa556c574022fa3bf4704 (patch) | |
| tree | e816e23f4b2bd6b1f3b733c28d102900cba50c18 /drivers/gpu/drm/i915/i915_suspend.c | |
| parent | fff24e21e17e438bf24791ed9cea7bbc02ad2dbb (diff) | |
| download | linux-04115a9dee110b52a8eaa556c574022fa3bf4704.tar.gz linux-04115a9dee110b52a8eaa556c574022fa3bf4704.tar.bz2 linux-04115a9dee110b52a8eaa556c574022fa3bf4704.zip | |
drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.
Signed-off-by: Eric Anholt <eric@anholt.net>
Cc: stable@vger.kernel.org
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 30d924f447c0..2b5eb229ff2c 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -827,7 +827,7 @@ int i915_save_state(struct drm_device *dev) if (IS_IRONLAKE_M(dev)) ironlake_disable_drps(dev); - if (IS_GEN6(dev)) + if (INTEL_INFO(dev)->gen >= 6) gen6_disable_rps(dev); /* Cache mode state */ @@ -886,7 +886,7 @@ int i915_restore_state(struct drm_device *dev) intel_init_emon(dev); } - if (IS_GEN6(dev)) { + if (INTEL_INFO(dev)->gen >= 6) { gen6_enable_rps(dev_priv); gen6_update_ring_freq(dev_priv); } |