[Intel-gfx] [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.

[Kenneth Graunke]

On 01/23/2012 04:14 PM, Eric Anholt wrote:
> Signed-off-by: Eric Anholt<eric at anholt.net>
> Cc: stable at vger.kernel.org
> ---
>   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 30d924f..2b5eb22 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);
>   	}

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>