From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: intel_sdvo_init: trying to register non-static key Date: Fri, 07 Feb 2014 18:47:54 +0200 Message-ID: <1391791674.21697.2.camel@intelbox> References: <20140207093205.GA24395@pd.tnic> <87d2iz18vi.fsf@intel.com> <1391771542.5669.6.camel@intelbox> <20140207112809.GG24395@pd.tnic> <20140207145149.GZ17001@phenom.ffwll.local> <1391787126.5669.11.camel@intelbox> <20140207154911.GK24395@pd.tnic> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-6vlXWJ9hRpVp3iWWyqvy" Return-path: In-Reply-To: <20140207154911.GK24395@pd.tnic> Sender: linux-kernel-owner@vger.kernel.org To: Borislav Petkov Cc: Daniel Vetter , Jani Nikula , intel-gfx@lists.freedesktop.org, Daniel Vetter , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org --=-6vlXWJ9hRpVp3iWWyqvy Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 2014-02-07 at 16:49 +0100, Borislav Petkov wrote: > On Fri, Feb 07, 2014 at 05:32:06PM +0200, Imre Deak wrote: > > I just realized it's a different issue, since it's on the init path. > > Also we set the drm device as the parent for the sdvo i2c adapter as > > opposed to the dp i2c adapter where it's the connector device. So the > > above patch won't help in Borislav's case. Ok, not sure why the sdvo initialization fails, but the lockdep warning is probably fixed by the below patch. Could you try it and send a dmesg with drm.debug=3D0xe? diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index 5104cf5..bd6e18b 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -187,19 +187,23 @@ static void kernfs_deactivate(struct kernfs_node *kn) =20 kn->u.completion =3D (void *)&wait; =20 - rwsem_acquire(&kn->dep_map, 0, 0, _RET_IP_); + if (kn->flags & KERNFS_LOCKDEP) + rwsem_acquire(&kn->dep_map, 0, 0, _RET_IP_); /* atomic_add_return() is a mb(), put_active() will always see * the updated kn->u.completion. */ v =3D atomic_add_return(KN_DEACTIVATED_BIAS, &kn->active); =20 if (v !=3D KN_DEACTIVATED_BIAS) { - lock_contended(&kn->dep_map, _RET_IP_); + if (kn->flags & KERNFS_LOCKDEP) + lock_contended(&kn->dep_map, _RET_IP_); wait_for_completion(&wait); } =20 - lock_acquired(&kn->dep_map, _RET_IP_); - rwsem_release(&kn->dep_map, 1, _RET_IP_); + if (kn->flags & KERNFS_LOCKDEP) { + lock_acquired(&kn->dep_map, _RET_IP_); + rwsem_release(&kn->dep_map, 1, _RET_IP_); + } } =20 --=-6vlXWJ9hRpVp3iWWyqvy Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJS9Q46AAoJEORIIAnNuWDFgyIH/2l0DhaHdIJ07uwLz09CMhw5 AAdb4nZF0Lgys6f/+rZdxZtcmMY4yNW6K4H2faiCwdNB6exgZGkaY8U3YOt+WDq1 n/p0/Gvuaz17ZUQHB4tod3Rp4uKbrrk9S3S3/AxxvCHmhZAS3kYAJOA4L8EPDGMK U58BbSIDM005GmH+UTcVVEMXyTp7fjDF8TUZFzR/JGLDwm+fCAeVmjpMkSGLHuAm KtvGGbKiOjNiHiNq+jekySv0zYRwdpZn1nJF7rxES7glStZmP2ctXPhcuXvWRIy6 BAtTG2xSJqCkDrrfrID9j5J3gTCea/NH/3XsyBAR/Gl1BfqBrYvrQy9HfMpkeFU= =3pxW -----END PGP SIGNATURE----- --=-6vlXWJ9hRpVp3iWWyqvy--