From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kenneth Graunke <kenneth@whitecape.org>
Subject: Re: [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU
 turbo after resume.
Date: Tue, 24 Jan 2012 10:28:41 -0800
Message-ID: <4F1EF859.7020003@whitecape.org>
References: <1327364046-20840-1-git-send-email-eric@anholt.net>
	<1327364046-20840-2-git-send-email-eric@anholt.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from homiemail-a37.g.dreamhost.com (caiajhbdcbef.dreamhost.com
	[208.97.132.145])
	by gabe.freedesktop.org (Postfix) with ESMTP id 9B0BA9E936
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 24 Jan 2012 10:28:43 -0800 (PST)
In-Reply-To: <1327364046-20840-2-git-send-email-eric@anholt.net>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Eric Anholt <eric@anholt.net>
Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org
List-Id: intel-gfx@lists.freedesktop.org

On 01/23/2012 04:14 PM, Eric Anholt wrote:
> Signed-off-by: Eric Anholt<eric@anholt.net>
> Cc: stable@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@whitecape.org>