From patchwork Fri Nov 14 22:11:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 5309811 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5D0D0C11AC for ; Fri, 14 Nov 2014 22:11:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8CCF720145 for ; Fri, 14 Nov 2014 22:11:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 45F9020142 for ; Fri, 14 Nov 2014 22:11:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2174C6E431; Fri, 14 Nov 2014 14:11:22 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f46.google.com (mail-qg0-f46.google.com [209.85.192.46]) by gabe.freedesktop.org (Postfix) with ESMTP id 360856E431 for ; Fri, 14 Nov 2014 14:11:20 -0800 (PST) Received: by mail-qg0-f46.google.com with SMTP id i50so12578533qgf.33 for ; Fri, 14 Nov 2014 14:11:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=OLPknRKcqiArBfWeyuCJ1z5xxbHRCA2i2zuZuoAT9kM=; b=z/n1B8FHWEB7KaNG5wNzMxV2h1SN01onQ43g8HXsKDB1pGlYrVKdyd0kujS5ZF/kSn yEeGbmx4rIQwCM/ZHLAnkpBr0uXOl0KAzEimMVKlOVzVmq2oekBy7td8iQfY/CWZeVwu gWTUZ/urqnwVwNuS89qndP2cRpWddJ8X4ZB4ehlpx/WYvt9LWvX9MRvg0DEkRtcwtxW2 FTllSU/Lg8jhaL9Bna7ICOVne2uwfAMsqAOs0sq5JEMUclF5sY/jMIl31ovkGKiu1T+A 11fgzsWvftTREPG24tLOUi28CC6r2Q6ddaB4yMFRTEFKfGLrSwlWxDdSBXp+HEFY4uge GHJA== X-Received: by 10.140.97.139 with SMTP id m11mr1223145qge.46.1416003079786; Fri, 14 Nov 2014 14:11:19 -0800 (PST) Received: from localhost ([2601:6:2c00:943:2677:3ff:fed3:ff40]) by mx.google.com with ESMTPSA id u65sm13005803qge.12.2014.11.14.14.11.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Nov 2014 14:11:19 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/atomic: rip out unnecessary locking Date: Fri, 14 Nov 2014 17:11:16 -0500 Message-Id: <1416003076-15164-1-git-send-email-robdclark@gmail.com> X-Mailer: git-send-email 1.9.3 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For async commit, it is *intentional* that those locks are not held. Daniel Vetter Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_atomic_helper.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index c0a07cb..fad2b93 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1006,8 +1006,6 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, if (!crtc) continue; - WARN_ON(!drm_modeset_is_locked(&crtc->mutex)); - funcs = crtc->helper_private; if (!funcs || !funcs->atomic_begin) @@ -1023,8 +1021,6 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, if (!plane) continue; - WARN_ON(!drm_modeset_is_locked(&plane->mutex)); - funcs = plane->helper_private; if (!funcs || !funcs->atomic_update)