aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-05-02 09:43:05 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-19 11:38:32 -0700
commit60724ed5b84824747d0bc5bb2a5b10af96503ca4 (patch)
treee27ae2ee893c2d81de183a9cb6c112f55f73c0a7
parentdfdaa3fc4649040b08ebe10d5b05993adf67645c (diff)
drm: don't check modeset locks in panic handler
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. Reported-and-tested-by: Borislav Petkov <bp@suse.de> References: http://lkml.kernel.org/r/20130502000206.GH15623@pd.tnic Cc: Dave Airlie <airlied@gmail.com> Cc: Borislav Petkov <bp@alien8.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/drm_crtc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index dd64a06dc5b..016c5d8b466 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -78,6 +78,10 @@ void drm_warn_on_modeset_not_all_locked(struct drm_device *dev)
{
struct drm_crtc *crtc;
+ /* Locking is currently fubar in the panic handler. */
+ if (oops_in_progress)
+ return;
+
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
WARN_ON(!mutex_is_locked(&crtc->mutex));