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

From: Keith Packard <keithp@keithp.com>
To: Eric Anholt <eric@anholt.net>, intel-gfx@lists.freedesktop.org
Cc: stable@vger.kernel.org
Subject: Re: [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.
Date: Mon, 23 Jan 2012 17:52:10 -0800	[thread overview]
Message-ID: <86hazluat1.fsf@sumi.keithp.com> (raw)
In-Reply-To: <1327364046-20840-2-git-send-email-eric@anholt.net>

[-- Attachment #1.1: Type: text/plain, Size: 1060 bytes --]

On Mon, 23 Jan 2012 16:14:06 -0800, Eric Anholt <eric@anholt.net> wrote:

>  	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);
>  	}

I fear we'll continue to find stuff like this...

I just reviewed all of the IS_GEN6 calls and found that
i915_forcewake_open/i915_forcewake_release only work on
GEN6; I assume these are supposed to work on GEN6 and after, so a test
like the above might be appropriate?

I didn't see much else, although there are some suspicious bits in
i915_debugfs.c that could probably use review.

In any case, the above patch is

Reviewed-by: Keith Packard <keithp@keithp.com>

and I will merge it into -fixes

-- 
keith.packard@intel.com

[-- Attachment #1.2: Type: application/pgp-signature, Size: 827 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx