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

[Keith Packard]

On Mon, 23 Jan 2012 16:14:06 -0800, Eric Anholt <eric at 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 at keithp.com>

and I will merge it into -fixes

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20120123/faec7385/attachment.sig>