On Mon, 23 Jan 2012 17:52:10 -0800, Keith Packard <keithp at keithp.com> wrote:
> 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?
Oh, so that's why the tools didn't work. Sigh.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20120124/fb00f6e0/attachment.pgp>
