From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keith Packard Subject: Re: Lock in the ironlake_panel_vdd_work() Date: Mon, 31 Oct 2011 11:33:22 -0700 Message-ID: References: <20111031130133.GJ50300@deviant.kiev.zoral.com.ua> <20111031133446.GE2920@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1133580457==" Return-path: Received: from keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id B935F9EC15 for ; Mon, 31 Oct 2011 11:33:27 -0700 (PDT) In-Reply-To: <20111031133446.GE2920@phenom.ffwll.local> 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: Daniel Vetter , Konstantin Belousov Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============1133580457== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --=-=-= Content-Transfer-Encoding: quoted-printable On Mon, 31 Oct 2011 14:34:46 +0100, Daniel Vetter wrote: > On Mon, Oct 31, 2011 at 03:01:33PM +0200, Konstantin Belousov wrote: > > I have a question about ironlake_panel_vdd_work(). Should it use > > the device struct_mutex, or need it to be the mode_config.mutex > > instead ? >=20 > Yeah. This was actually flagged in review by Chris and me, but seems to > have been lost in the merge. Keith? I thought I fixed that; it must have gotten lost in the fairly steady set of rebasing/reworking of that patch sequence. commit 241dedda2785f040da45576418686490431232d2 Author: Keith Packard Date: Mon Oct 31 11:30:10 2011 -0700 drm/i915: Use mode_config.mutex in ironlake_panel_vdd_work =20=20=20=20 Use of the struct_mutex is not correct for locking in mode setting path= s. =20=20=20=20 Signed-off-by: Keith Packard diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_d= p.c index 6611d90..30420c1 100644 =2D-- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -971,9 +971,9 @@ static void ironlake_panel_vdd_work(struct work_struct = *__work) struct intel_dp, panel_vdd= _work); struct drm_device *dev =3D intel_dp->base.base.dev; =20 =2D mutex_lock(&dev->struct_mutex); + mutex_lock(&dev->mode_config.mutex); ironlake_panel_vdd_off_sync(intel_dp); =2D mutex_unlock(&dev->struct_mutex); + mutex_unlock(&dev->mode_config.mutex); } =20 static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool syn= c) =2D-=20 keith.packard@intel.com --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIVAwUBTq7p8jYtFsjWk68qAQhieRAAs1hgCKOLQIlflX0N208H+EpA/OnbIWNq cZJrkv7BP9lnKgyx9q0qGLRvhHbVR+gHGK7Va+lKKGal8Z9blRhPACOWBYz7h9zn ORvuNnDBLBhViSrMuYVUwkOpPtTyvNj/VopvidOstbObn77lAZ3+qeV2vdt7nRTx IR3TyYhgQpLYy2prBR+X206xDfKj3gW7wCdbwbf1cCrsuRIU6RmIcIzdlwR/qiCi 7QS4ss6F5e517sJSr99sPIhq2X0s2rXXM+nLt5IbCbuB9RR+gXGn3UMLdtYJ2usz qrOIGgyvKEWhqke+Iq+JpDUg7j8L6FZxsbLt+v+EnRX7SGQnkb5Gu001J+XHKqdN 29LHxWMJ9WI17nZzELoXPCydQDVzoRMof7yt2JIGPkBeBIkSkpTJIl/f1Dw7Jvme vfQ6XkUeyLN3nGjdGpFMSDE61825shhg08N+57Yh7/dkJINDgvkmrB2r3iA84LG9 XLhvOxJMcet8ctp34puqSdNfk2ALuIAUF4O0ynWyOjOKdN5j487BrYR/bfKxdHYP GH5dvO+vLgyJEJbi+vPxPhRju08rAJNS1hRrBFN1lMP/b6oy87LSRc4JLyZDZvGo t/EmFOiHPlKXqS6OOuSBdLIngFLliIPH3eUwXnk1G3rCbtUruB++lLC0l/yHlKOK rh2P7TFWez0= =iNEg -----END PGP SIGNATURE----- --=-=-=-- --===============1133580457== 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 --===============1133580457==--