From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/2] drm/ast: Fix double lock at PM resume Date: Mon, 12 May 2014 10:10:47 +0200 Message-ID: <20140512081047.GC25056@phenom.ffwll.local> References: <1399616055-13427-1-git-send-email-tiwai@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DEA76E45A for ; Mon, 12 May 2014 01:10:52 -0700 (PDT) Received: by mail-wi0-f169.google.com with SMTP id hi2so5077254wib.4 for ; Mon, 12 May 2014 01:10:51 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1399616055-13427-1-git-send-email-tiwai@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Takashi Iwai Cc: Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Fri, May 09, 2014 at 08:14:14AM +0200, Takashi Iwai wrote: > The recent commit [3ea87855: drm/helper: lock all around force mode > restore] introduced drm_modeset_lock_all() in > drm_helper_resume_force_mode() itself, while ast driver still takes > this lock before calling it. Remove the caller side lock for avoid a > fatal deadlock. > > Signed-off-by: Takashi Iwai Oops, failed to do the audit correctly. Thanks for catching this. Reviewed-by: Daniel Vetter > --- > drivers/gpu/drm/ast/ast_drv.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c > index 5137f15dba19..27e56dda476d 100644 > --- a/drivers/gpu/drm/ast/ast_drv.c > +++ b/drivers/gpu/drm/ast/ast_drv.c > @@ -94,9 +94,7 @@ static int ast_drm_thaw(struct drm_device *dev) > ast_post_gpu(dev); > > drm_mode_config_reset(dev); > - drm_modeset_lock_all(dev); > drm_helper_resume_force_mode(dev); > - drm_modeset_unlock_all(dev); > > console_lock(); > ast_fbdev_set_suspend(dev, 0); > -- > 1.9.2 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch