From patchwork Tue Jun 21 12:41:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9190467 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 A64D760756 for ; Tue, 21 Jun 2016 12:41:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9739228119 for ; Tue, 21 Jun 2016 12:41:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B97B28169; Tue, 21 Jun 2016 12:41:21 +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 2C4CC28119 for ; Tue, 21 Jun 2016 12:41:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF5B16E158; Tue, 21 Jun 2016 12:41:19 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lb0-x242.google.com (mail-lb0-x242.google.com [IPv6:2a00:1450:4010:c04::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 555026E6CB for ; Tue, 21 Jun 2016 12:41:17 +0000 (UTC) Received: by mail-lb0-x242.google.com with SMTP id td3so1734752lbb.2 for ; Tue, 21 Jun 2016 05:41:17 -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=/Ni0p7+sx9EJezWNGr4QE1jtSCMc9CvU7CScYm08eB0=; b=FDC3evbPlxHijY4Oja7K8UwjhZY91Nz4R5D5YhYGHOqDdMai+P7sgLpe8GQPyOZopz EvPHD5VOg7LTh940Fp5D7bfCf4dcKoHoXldcUlxL6g7UDMU6zNGN6hu9o6Z5SVaxicQk 86HzJPa70agOjn6cjXao+5/A678JH8Ael4+Wo= 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=/Ni0p7+sx9EJezWNGr4QE1jtSCMc9CvU7CScYm08eB0=; b=PCCXHaXP50V0MI5Gr+udt4BfQo7zhM4Fn7PO8oLere2jhUqVnkQzthZJRFQuyUNi6c V/KDc9amiwCo6QRY9AspDCTDCPAFssCz52cK5mBXS0M1o8f9CnYOwYdDR9G3VVEXMRmK wE0RButWmTldj5f7vj/Hg3oYqGiDAn0vbgOvXZGAxl+u96cA7HslnX7Wt30VdEvQihOg fLNP83aU+bHqkMfKRlkazV9CCSU6dDS56X1wvcCFd0we8ncBQx7QRk5ri6mbaIrnCVJI 1StfcIsJPn1Qs6x3klJEJWNP5pkG46TtEbSLlsulF2udNlOTlymZen/ONmHNclCFS7ne TZGg== X-Gm-Message-State: ALyK8tJKtOE3OcNS2mXYy88qGASoPXq1hHeATSgNzsx9ecw4GA8CBq8hVAQEfGxwXzTaAQ== X-Received: by 10.194.164.200 with SMTP id ys8mr19405802wjb.79.1466512875263; Tue, 21 Jun 2016 05:41:15 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id c9sm68734518wjh.49.2016.06.21.05.41.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 05:41:14 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 21 Jun 2016 14:41:08 +0200 Message-Id: <1466512868-9182-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <20160621094417.GD1821@nuc-i3427.alporthouse.com> References: <20160621094417.GD1821@nuc-i3427.alporthouse.com> Cc: Daniel Vetter , Intel Graphics Development Subject: [Intel-gfx] [PATCH] drm: Drop mode_config.mutex from get_resources ioctl 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 The only thing this protected is the connector_list, which is now protected differently. v2: Also remove comment (Chris). Cc: Chris Wilson Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_crtc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 13c3bacc6b51..f8931b82865a 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1904,9 +1904,6 @@ int drm_mode_getresources(struct drm_device *dev, void *data, card_res->count_fbs = fb_count; mutex_unlock(&file_priv->fbs_lock); - /* mode_config.mutex protects the connector list against e.g. DP MST - * connector hot-adding. CRTC/Plane lists are invariant. */ - mutex_lock(&dev->mode_config.mutex); card_res->max_height = dev->mode_config.max_height; card_res->min_height = dev->mode_config.min_height; card_res->max_width = dev->mode_config.max_width; @@ -1961,7 +1958,6 @@ int drm_mode_getresources(struct drm_device *dev, void *data, card_res->count_connectors = connector_count; out: - mutex_unlock(&dev->mode_config.mutex); return ret; }