From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH] drm/i915: Prevent a machine hang by checking crtc->active before loading lut Date: Fri, 24 Feb 2012 09:27:44 -0800 Message-ID: <20120224092744.65c77284@jbarnes-desktop> References: <1330103565-2472-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0766780024==" Return-path: Received: from oproxy6-pub.bluehost.com (oproxy6-pub.bluehost.com [67.222.54.6]) by gabe.freedesktop.org (Postfix) with SMTP id 6FEBD9E754 for ; Fri, 24 Feb 2012 09:27:51 -0800 (PST) In-Reply-To: <1330103565-2472-1-git-send-email-chris@chris-wilson.co.uk> 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: Chris Wilson Cc: intel-gfx@lists.freedesktop.org, Alban Browaeys , stable@kernel.org List-Id: intel-gfx@lists.freedesktop.org --===============0766780024== Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/Cx2a2GYRD4sqg.I7+a_TT3h"; protocol="application/pgp-signature" --Sig_/Cx2a2GYRD4sqg.I7+a_TT3h Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Fri, 24 Feb 2012 17:12:45 +0000 Chris Wilson wrote: > From: Alban Browaeys >=20 > Before loading the lut (gamma), check the active state of intel_crtc, > otherwise at least on gen2 hang ensue. >=20 > This is reproducible in Xorg via: > xset dpms force off > then > xgamma -rgamma 2.0 # freeze. >=20 > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=3D44505 > Signed-off-by: Alban Browaeys > Signed-off-by: Chris Wilson > Cc: stable@kernel.org > --- > drivers/gpu/drm/i915/intel_display.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index cdcf99b..4b48de5 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -6268,7 +6268,7 @@ void intel_crtc_load_lut(struct drm_crtc *crtc) > int i; > =20 > /* The clocks have to be on to load the palette. */ > - if (!crtc->enabled) > + if (!crtc->enabled || !intel_crtc->active) > return; > =20 > /* use legacy palette for Ironlake */ Yeah seems reasonable, thanks Chris. Reviewed-by: Jesse Barnes --=20 Jesse Barnes, Intel Open Source Technology Center --Sig_/Cx2a2GYRD4sqg.I7+a_TT3h Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBAgAGBQJPR8iQAAoJEIEoDkX4Qk9ho2MQAMYDs/RQV2BDzpTQSf/Man0j P2TJih7uurFz7i0aibZzLuD9wP0hJlQ0Jl5gItBdbXKf3YxSa34iYj2aSDbzxO4I bKwYRJr7NtNR5HqqblK+S6tCke8T/pgMJpMaAJkId+7NHAh+cNCcH6DllpnzIVYz 9vKAZdFHg2NZr3gIoFo8XovKVYurCgcUJiL9wYkAMvJwHtmix4PIKROfq5EIbLmL iX6+Oca8jaHQZNAEeqjysS6NrB5SiM20EanlGNiXt/JEdeiZs8KoKVydI/eaU/Kl y/vvCfYdmAWVAd1ZM5QAo42OX0q8XIqQHlxhJ9yHBYpmqhsj22CaAAd4MllQ4yv1 vKl3j8yNebn3OUJDOCTe+uJQ4fRy4s5NpGQeNBcJO9YCNgJmwd+FebxCyWV95Hku bgq8ZeVXXRYj13mHqHU6kP6JIQawizz/tnwvkr9g7Ax1Q9ZlTlAq9ZSuw2WRW8QB CT4nZMFhuPKBlsgMS4jvWA7RMY42PNw++oh0wDIDuuBvMT77ZPcSYtsSFR7i4ot+ IlhzdyS+ozb5Db9GowVe4ApFaO58UdPRhA+gz3XbYeKqeT4lj+GtfM1odOr8bAsB +wNEY2opd80YHDzx/vYJG86KFiXaWW7/DzREmBuOoEL1/cYQL0Ji9eWZncV0zhz2 u6wxJSlZ2n18dd+Oabzt =4GIT -----END PGP SIGNATURE----- --Sig_/Cx2a2GYRD4sqg.I7+a_TT3h-- --===============0766780024== 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 --===============0766780024==--