From patchwork Wed Dec 12 13:06:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1866071 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id E2BD33FC81 for ; Wed, 12 Dec 2012 13:29:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D3816E6560 for ; Wed, 12 Dec 2012 05:29:12 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 073E0E63B7 for ; Wed, 12 Dec 2012 05:07:32 -0800 (PST) Received: by mail-ee0-f49.google.com with SMTP id c4so424140eek.36 for ; Wed, 12 Dec 2012 05:07:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=8uAPS7Hf/SAq8V1LB8+O87XidMeOwxbbJRyjVWxrZ0M=; b=cpPlMo51vBKEJfwmJ/kn7GUeLIvUTdDK0zYqiU2SQ65UtmgoPRvGKji0R0gWwhgnpr +HY1GUd+g/SojpPV/0R12RRuAESOZMWcp5MR1O2ObbIpfxgXMHPgGu21TO73ETDbZw0i DzEnyVYFZMAA4YeF+PPXB8S0q1uHqo9w7nbBs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=8uAPS7Hf/SAq8V1LB8+O87XidMeOwxbbJRyjVWxrZ0M=; b=HmZmVSj+EVt50HlnhuU2aPQqUYPHkFUhuvaidYzJltdwS0Way4MiAIw3o+C1k4iZh3 o39E5hrwhtrH+LwDnad21FVu5XAqvsCHLpSH2XK9UCVJz4Lmq3XPvlY/TDEtl63ETh6X zQjkGFiMtv1ERTCEZ0qUnDixIwKrnVI8fntpjmhr4Dgj6zrHXXOIhlbnHOKA/3fzNfjz WWJmbsaPDv16DMQ9FZ3U3RBItG3KjNzsaBfq1ztGUMHI5cg4nQuKz2z2Vjn9pv3c9FmM xQXJp0JlublrqQ+wlHTAV+jlI+1OuEnvScTOtc4iTqACOfRosWQg/KYBcyVUsegZYvI3 7v4A== Received: by 10.14.216.70 with SMTP id f46mr2711557eep.12.1355317651813; Wed, 12 Dec 2012 05:07:31 -0800 (PST) Received: from biers.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id r1sm55868541eeo.2.2012.12.12.05.07.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 05:07:31 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 07/37] drm/ast: use drm_modeset_lock_all Date: Wed, 12 Dec 2012 14:06:47 +0100 Message-Id: <1355317637-16742-8-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355317637-16742-1-git-send-email-daniel.vetter@ffwll.ch> References: <1355317637-16742-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnr9+cDlXDU2bCaqt4NjnWPjsUQvIij+ZrwAg56LkWc+4TnHX56DqkOGodbsoln3hGhFSRN Cc: Nouveau Dev , Intel Graphics Development , Radeon Dev , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Just a call to drm_helper_resume_force_mode, obviously wants full locking for that. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/ast/ast_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c index 31123b6..f5f24b3 100644 --- a/drivers/gpu/drm/ast/ast_drv.c +++ b/drivers/gpu/drm/ast/ast_drv.c @@ -95,9 +95,9 @@ static int ast_drm_thaw(struct drm_device *dev) ast_post_gpu(dev); drm_mode_config_reset(dev); - mutex_lock(&dev->mode_config.mutex); + drm_modeset_lock_all(dev); drm_helper_resume_force_mode(dev); - mutex_unlock(&dev->mode_config.mutex); + drm_modeset_unlock_all(dev); console_lock(); ast_fbdev_set_suspend(dev, 0);