From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keith Packard 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 Message-ID: <86hazluat1.fsf@sumi.keithp.com> References: <1327364046-20840-1-git-send-email-eric@anholt.net> <1327364046-20840-2-git-send-email-eric@anholt.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0720079289==" Return-path: Received: from keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 6C2F09E78E for ; Mon, 23 Jan 2012 17:52:14 -0800 (PST) In-Reply-To: <1327364046-20840-2-git-send-email-eric@anholt.net> 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: Eric Anholt , intel-gfx@lists.freedesktop.org Cc: stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org --===============0720079289== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --=-=-= Content-Transfer-Encoding: quoted-printable On Mon, 23 Jan 2012 16:14:06 -0800, Eric Anholt wrote: > 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); > } 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 and I will merge it into -fixes =2D-=20 keith.packard@intel.com --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUBTx4OyjYtFsjWk68qAQguZRAAjCLFiwKOCPeIDoqlQegnGdOKspqyv3Q5 PIaGYqru80NzFIV6OZKqJD4ftDvhjtNWYbf+ph/Y/W0MEEDzxoXDklQBSK6LGfwL VEwZlaa++ZIoFQZGYPAZepuWgTqYQwxP+gjJ8LbwyL2IhpLrb9L2rDkcUC8wilQ/ RflivwWGJ/SdXfiWt3baSjgnCxwYX6w6oEFn8FLxOsI50RO7Wjh+Mtp0jbkNcwxc lwSZSIJ2ZXFtwlFJgygtuXfLz8l1DfMdoKZOp577MRE/uZYgEiT4IB1R0uA6JCrz u6KiKk0jEy5kBe/ZB9LSUQ8fH5h3QhpVXo5uNJGvenOeICd9y9+FkOmax7BPXQAR nm7dAS5QqQhtnt7p0qa4y3xWeWoBRPNh1oz0VXCJ7MZ0Ycti2c5Gh6t2Fr6fM4nt rNY3c7ui5bApdfMrntvxZ6heCd021Le0QtBWH6NUkCGAnziZBWHMKR8ZuOWbksyE MQJuGLahiih99XiT2pgoMQrsji8A8yk6DTHLhYZoTMlC4U9epz93kRJNWhP98Kv/ EP5J2xgNxXvAmssqPxqo0+SpDSz5Jx87mtypVNndi/CQFFzqCxFn4X0Xzz5d+UzQ M0o+ZpnoL1DkYxsOzjDXA5QZm82yYHdiHIqdRwnypsXPvXO7l0PL7PHWLR1Gj5fF KnBjs2ak4Pw= =Q5SD -----END PGP SIGNATURE----- --=-=-=-- --===============0720079289== 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 --===============0720079289==--