From patchwork Tue Jun 21 09:10:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9189983 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 CFA1C60756 for ; Tue, 21 Jun 2016 09:11:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC76227FC0 for ; Tue, 21 Jun 2016 09:11:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0CDA28047; Tue, 21 Jun 2016 09:11:14 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 747F827FC0 for ; Tue, 21 Jun 2016 09:11:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B8956E69B; Tue, 21 Jun 2016 09:11:04 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id B43D86E684 for ; Tue, 21 Jun 2016 09:10:49 +0000 (UTC) Received: by mail-lf0-x241.google.com with SMTP id w130so2053750lfd.2 for ; Tue, 21 Jun 2016 02:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9mJGjo6TeK5pSoje6258cbP9FfUW4jJSdTiK6sr7Q6I=; b=Nk/7yUcrVJhnTVqqQXVHbV5EDoE+UJEbUb+S26qxW3XIDcjJwHQsR+91L1S+Hqyxuu aQQ8HLSZ4tENV+TnrfaJb581UAtpQVpsltOKwZv6ysbN6YQc2pzdIyVTqs+J3R4/of9S C7Scvb6WY+g8VH7D3YyZ/yw79PoHZoLyxnBps= 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:in-reply-to :references; bh=9mJGjo6TeK5pSoje6258cbP9FfUW4jJSdTiK6sr7Q6I=; b=KioRxAICv5vNdBCdZrWk5m7DNr7I+h9H6ILXvsoaPgJVLgWr9q9gY/Ig6+Lep//0um z4RiKmtHDhV11fFe644rzDXTn1bSswui8FA7vg6eC8gAbYTSMw14otPYN23GCmGolTQV DRtWjvRRWxmO1VxH1TPxUpDpizW3F21Fj0Nse6PCq4wkcSjbVtTSgKdy89nJmGkuDHZ6 4VddqxM0fMoprgL3/RU6OPlItcTKOBSnPq+X6unv79R6ztoOGIIqS+if0tMbuAuRvs1k ZyFOhBlm0+44psgNOKcTxymoaAm4XfmPKBNxgS/BbhKhOAO6jDz2mhzKPYaHYwiDkAWH qphg== X-Gm-Message-State: ALyK8tLX8eZJq/fn1jA8a0/+qAe4LO/7UvXtgMmTAhbOGpwSc8LEB5bHgBmVyiN/N2TySQ== X-Received: by 10.28.25.134 with SMTP id 128mr2195917wmz.16.1466500247525; Tue, 21 Jun 2016 02:10:47 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id v70sm1930380wmf.18.2016.06.21.02.10.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 02:10:46 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 21 Jun 2016 11:10:31 +0200 Message-Id: <1466500235-21282-7-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1466500235-21282-1-git-send-email-daniel.vetter@ffwll.ch> References: <1466500235-21282-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development Subject: [Intel-gfx] [PATCH 06/10] drm: Drop cargo-culted modeset_lock_all from encoder/plane init/cleanup X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP We can't hotplug encoders/planes, there's no point in that locking. It was also inconsistent because lacking from plane_init. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_crtc.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 2a927488ec26..6a8f91e8821b 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1131,11 +1131,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; @@ -1163,9 +1161,6 @@ out_put: if (ret) drm_mode_object_unregister(dev, &encoder->base); -out_unlock: - drm_modeset_unlock_all(dev); - return ret; } EXPORT_SYMBOL(drm_encoder_init); @@ -1185,12 +1180,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)); } @@ -1341,7 +1334,6 @@ void drm_plane_cleanup(struct drm_plane *plane) { struct drm_device *dev = plane->dev; - drm_modeset_lock_all(dev); kfree(plane->format_types); drm_mode_object_unregister(dev, &plane->base); @@ -1356,7 +1348,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)