From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757564Ab2BAV1o (ORCPT ); Wed, 1 Feb 2012 16:27:44 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58370 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757480Ab2BAVTZ (ORCPT ); Wed, 1 Feb 2012 16:19:25 -0500 X-Sasl-enc: gz/nuWUrbOqvJRzyR++37565xSBG90/EfW1JXQ/u64ul 1328131164 X-Mailbox-Line: From gregkh@clark.kroah.org Wed Feb 1 13:00:46 2012 Message-Id: <20120201210046.751517104@clark.kroah.org> User-Agent: quilt/0.51-15.1 Date: Wed, 01 Feb 2012 12:59:56 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Eric Anholt , Keith Packard , Eugeni Dodonov , Kenneth Graunke Subject: [32/89] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume. In-Reply-To: <20120201210505.GA26028@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Anholt commit 04115a9dee110b52a8eaa556c574022fa3bf4704 upstream. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard Reviewed-by: Eugeni Dodonov Reviewed-by: Kenneth Graunke Signed-off-by: Keith Packard Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/i915_suspend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -822,7 +822,7 @@ int i915_save_state(struct drm_device *d 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 */ @@ -881,7 +881,7 @@ int i915_restore_state(struct drm_device 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); }