On Fri, May 17, 2013 at 01:27:40PM +0100, Luis Henriques wrote: > On Thu, May 16, 2013 at 05:49:00PM -0400, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > This is a note to let you know that I've just added the patch titled > > > > drm: don't check modeset locks in panic handler > > > > to the 3.0-stable tree which can be found at: > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > > > The filename of the patch is: > > drm-don-t-check-modeset-locks-in-panic-handler.patch > > and it can be found in the queue-3.0 subdirectory. > > > > If you, or anyone else, feels it should not be added to the stable tree, > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > > > From a9b054e8ab06504c2afa0e307ee78d3778993a1d Mon Sep 17 00:00:00 2001 > > From: Daniel Vetter <daniel.vetter@xxxxxxxx> > > Date: Thu, 2 May 2013 09:43:05 +0200 > > Subject: drm: don't check modeset locks in panic handler > > > > From: Daniel Vetter <daniel.vetter@xxxxxxxx> > > > > commit a9b054e8ab06504c2afa0e307ee78d3778993a1d upstream. > > > > Since we know that locking is broken in that case and it's more > > important to not flood the dmesg with random gunk. > > > > References: http://lkml.kernel.org/r/20130502000206.GH15623@xxxxxxx > > Cc: Dave Airlie <airlied@xxxxxxxxx> > > Cc: Borislav Petkov <bp@xxxxxxxxx> > > Reported-and-tested-by: Borislav Petkov <bp@xxxxxxx> > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > > > --- > > drivers/gpu/drm/drm_crtc.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > --- a/drivers/gpu/drm/drm_crtc.c > > +++ b/drivers/gpu/drm/drm_crtc.c > > @@ -907,6 +907,10 @@ int drm_mode_group_init_legacy_group(str > > if ((ret = drm_mode_group_init(dev, group))) > > return ret; > > > > + /* Locking is currently fubar in the panic handler. */ > > + if (oops_in_progress) > > + return; > > + > > This is not correct. In 3.0, function > drm_mode_group_init_legacy_group() isn't void, it should return an > int. > > This comment also applies to the 3.4 backport. Ah, good catch, I'll just drop this patch from both trees. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html