From patchwork Tue Nov 29 09:45:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9451295 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 09DA06071E for ; Tue, 29 Nov 2016 09:45:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBF2D27F10 for ; Tue, 29 Nov 2016 09:45:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E07B82808F; Tue, 29 Nov 2016 09:45:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 73BD927F10 for ; Tue, 29 Nov 2016 09:45:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 16DCA6E5B4; Tue, 29 Nov 2016 09:45:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wj0-x243.google.com (mail-wj0-x243.google.com [IPv6:2a00:1450:400c:c01::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 864696E5B4 for ; Tue, 29 Nov 2016 09:45:42 +0000 (UTC) Received: by mail-wj0-x243.google.com with SMTP id jb2so17353005wjb.3 for ; Tue, 29 Nov 2016 01:45:42 -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; bh=4oDY7OTe0nToAAoZouqtf/Zwgr3yEUGVWMkchAGSqTo=; b=OqlGNnZX0DyXV0nk1BwVSV9SIBRoumtTf0OooLJvOn8pQV/DWSEpoogOMF8Aflkqy3 GG6lsR17j7F0juscox8cP7jY1baOy4lA7TF7AW7sy4O25RKh+nYz6TrHa121qRhDKSr4 DO6h0f9bkHefwg4ZfOQT2ZRB74XonfTUPNSfg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4oDY7OTe0nToAAoZouqtf/Zwgr3yEUGVWMkchAGSqTo=; b=BdmZR69M9ObPXkeZ/8aZsP0pEZIGOVMiZPuIufB6wf7HjFazc8VtKWYqSnMoUm91kR 9+Gqzzerj0/nnDQASNeGKUhAkksaYlwVdpPlX26W4YKyZghoAP5+rmor7PjEpRJYfcKj FMlvBm9Qv9wNTZS+uzCMQJo0Bunk/hXLgIPEBV9wZ2EHQXnB0BGfEULVN2Z2XtnKE6Ip 75l3zJvRfd42DtgK/X2AhbeLYXvXgEsUY5BR7ePsx/tjHCYl1jMgWHwj0wHPwJK/0eK2 OBH+6JdGublf9lwqK2p4tiTEq1j5WimUjSqUWhqFA0te3hMIF/QHioB4G3bSHqIDT0wd gzeQ== X-Gm-Message-State: AKaTC03nMtUBAHORx5le1DhMlz8Hn5ywxUsyeMMF6HpkyofS4mymkiM9AUcGqIX+XEibuQ== X-Received: by 10.194.79.5 with SMTP id f5mr26841428wjx.13.1480412741008; Tue, 29 Nov 2016 01:45:41 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id ef10sm47298364wjd.22.2016.11.29.01.45.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Nov 2016 01:45:40 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm: Fix locking cargo-cult in encoder/plane init/cleanup Date: Tue, 29 Nov 2016 10:45:38 +0100 Message-Id: <20161129094538.9650-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.10.2 Cc: Daniel Vetter , Daniel Vetter 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-Virus-Scanned: ClamAV using ClamSMTP Encoders&planes can't be hotplugged, we dont need looking for this since it's all single-threaded driver setup/teardown code. CRTCs already don't grab locks. While at it I noticed that plane's are missing the drm_modeset_lock_fini() call, so add it. Signed-off-by: Daniel Vetter Reviewed-by: Frank Binns --- drivers/gpu/drm/drm_encoder.c | 9 +-------- drivers/gpu/drm/drm_plane.c | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c index 5c067719164d..992879f15f23 100644 --- a/drivers/gpu/drm/drm_encoder.c +++ b/drivers/gpu/drm/drm_encoder.c @@ -110,11 +110,9 @@ int drm_encoder_init(struct drm_device *dev, { int ret; - drm_modeset_lock_all(dev); - ret = drm_mode_object_get(dev, &encoder->base, DRM_MODE_OBJECT_ENCODER); if (ret) - goto out_unlock; + return ret; encoder->dev = dev; encoder->encoder_type = encoder_type; @@ -142,9 +140,6 @@ int drm_encoder_init(struct drm_device *dev, if (ret) drm_mode_object_unregister(dev, &encoder->base); -out_unlock: - drm_modeset_unlock_all(dev); - return ret; } EXPORT_SYMBOL(drm_encoder_init); @@ -164,12 +159,10 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) * the indices on the drm_encoder after us in the encoder_list. */ - drm_modeset_lock_all(dev); drm_mode_object_unregister(dev, &encoder->base); kfree(encoder->name); list_del(&encoder->head); dev->mode_config.num_encoder--; - drm_modeset_unlock_all(dev); memset(encoder, 0, sizeof(*encoder)); } diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 419ac313c36f..9147aab182c4 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -221,7 +221,8 @@ void drm_plane_cleanup(struct drm_plane *plane) { struct drm_device *dev = plane->dev; - drm_modeset_lock_all(dev); + drm_modeset_lock_fini(&plane->mutex); + kfree(plane->format_types); drm_mode_object_unregister(dev, &plane->base); @@ -236,7 +237,6 @@ void drm_plane_cleanup(struct drm_plane *plane) dev->mode_config.num_total_plane--; if (plane->type == DRM_PLANE_TYPE_OVERLAY) dev->mode_config.num_overlay_plane--; - drm_modeset_unlock_all(dev); WARN_ON(plane->state && !plane->funcs->atomic_destroy_state); if (plane->state && plane->funcs->atomic_destroy_state)