From: Eric Anholt Subject: Re: [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume. Date: Tue, 24 Jan 2012 10:11:55 -0800 Message-ID: <87aa5d9dhw.fsf@eliezer.anholt.net> References: <1327364046-20840-1-git-send-email-eric@anholt.net> <1327364046-20840-2-git-send-email-eric@anholt.net> <86hazluat1.fsf@sumi.keithp.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0847727274==" Return-path: In-Reply-To: <86hazluat1.fsf@sumi.keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Keith Packard , intel-gfx@lists.freedesktop.org Cc: stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org --===============0847727274== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" --=-=-= Content-Transfer-Encoding: quoted-printable On Mon, 23 Jan 2012 17:52:10 -0800, Keith Packard wrote: > On Mon, 23 Jan 2012 16:14:06 -0800, Eric Anholt wrote: >=20 > > if (IS_IRONLAKE_M(dev)) > > ironlake_disable_drps(dev); > > - if (IS_GEN6(dev)) > > + if (INTEL_INFO(dev)->gen >=3D 6) > > gen6_disable_rps(dev); > >=20=20 > > /* Cache mode state */ > > @@ -886,7 +886,7 @@ int i915_restore_state(struct drm_device *dev) > > intel_init_emon(dev); > > } > >=20=20 > > - if (IS_GEN6(dev)) { > > + if (INTEL_INFO(dev)->gen >=3D 6) { > > gen6_enable_rps(dev_priv); > > gen6_update_ring_freq(dev_priv); > > } >=20 > I fear we'll continue to find stuff like this... >=20 > 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. --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAk8e9GsACgkQHUdvYGzw6vdFtQCeJuWVuObxT4c8Hy1cZr+rKOBp LngAnRCB+f0jrqWjThjWVvqQ6lVX4b1g =lgSp -----END PGP SIGNATURE----- --=-=-=-- --===============0847727274== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0847727274==--