From patchwork Wed Jun 15 12:17:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9178997 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 236F5604DB for ; Wed, 15 Jun 2016 17:20:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F54727D4A for ; Wed, 15 Jun 2016 17:20:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03EA527EED; Wed, 15 Jun 2016 17:20:33 +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=unavailable 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 9948A27D4A for ; Wed, 15 Jun 2016 17:20:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E253B6E16A; Wed, 15 Jun 2016 17:20:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [87.106.93.118]) by gabe.freedesktop.org (Postfix) with ESMTP id F31D26E16A for ; Wed, 15 Jun 2016 17:20:26 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from nuc-i3427.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 60950179-1500048 for ; Wed, 15 Jun 2016 18:20:38 +0100 Received: by nuc-i3427.alporthouse.com (sSMTP sendmail emulation); Wed, 15 Jun 2016 18:20:23 +0100 Resent-From: Chris Wilson Resent-Date: Wed, 15 Jun 2016 18:20:23 +0100 Resent-Message-ID: <20160615172023.GC6754@nuc-i3427.alporthouse.com> Resent-To: dri-devel@lists.freedesktop.org Received: from mail.surfanytime.net [87.106.93.118] by nuc-i3427 with POP3 (fetchmail-6.3.26) for (single-drop); Wed, 15 Jun 2016 13:21:39 +0100 (BST) Received: from svcemlmxl12.netnames.net (unverified [185.26.230.76]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 60937660-1500048 for ; Wed, 15 Jun 2016 13:18:59 +0100 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35469) by svcemlmxl12.netnames.net with esmtp (NBT 4.72 1) id 1bD9mP-00057l-F1 for chris@chris-wilson.co.uk; Wed, 15 Jun 2016 13:18:45 +0100 Received: by mail-wm0-f65.google.com with SMTP id k184so5530652wme.2 for ; Wed, 15 Jun 2016 05:18:45 -0700 (PDT) Received-SPF: pass (svcemlmxl12.netnames.net: domain of gmail.com designates 74.125.82.65 as permitted sender) client-ip=74.125.82.65; envelope-from=chris.ickle.wilson@gmail.com; helo=mail-wm0-f65.google.com; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=VenCe6bk6KLmvgi3OW2tL4q2sUCIcDAjN0ptBINV9GY=; b=V6WNAyqohC4WrTwWMhrDLPJVmsF+c2gf+5w53Sl0PpkGExMJmt2wyyIzoG+U44apIY 2Estlk0oMra/fPuX2eRN553yi3DX29/wnUUET8BvYAoNmgS+PGRoB9oDu3Sus1hz+rFZ kQcYd2WAisLy/L/i02Rk0AQFKKrPp2vREGAHuzsh66mgQLvEN6OzHGRaeDWNIhT3j5zO Ji3qqDqyFhVlSP51NjsFncjO9tx4mlVK3R4shqeDEsIVDjy7mblAg0v/vXlnt+VjSOC2 YoX3JQawOaaGXyIhnbA68DSvYVlFH2nrdFeWmWtgVlqZNKom92/HxJ//EGa8NVMVilnA 2Olw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=VenCe6bk6KLmvgi3OW2tL4q2sUCIcDAjN0ptBINV9GY=; b=jvlTNuHK2jN/hMhEJpeSVQKhxrAEaLOsBBt61CNR3zWl3D0aORAMefrkTEUGts60DX usmfpHbExCjl2WVH7SQIVMquLCr4D6OjO8fUZjR7dn+6evXtPeC1Avi2ZTAK1fsB/XU7 GIySm7hqpalZMzVs6wGpGaEXX7Woo1NpAA/rOQIVD+gkM8WEbqbn/D7qNhnBFme/qFe1 bLw3g9nHamO9eVVZKfkT8QIi10eOwfucR/bPJn5T1nedo7xgVObe2DcnNEgE3HDmBWRE 6uQubODVScKYsLIEAeLhInDKykExymXUILNBqVEzN8+P8ebRIiiplpJLNmhfQzLrPlCm emtQ== X-Gm-Message-State: ALyK8tLkjcWCWCqjG8WV1nIG2BradBFhnnTC7E9o87aet+8CS3FiDIgTi/Th/sxRx7slOw== X-Received: by 10.28.98.137 with SMTP id w131mr9207050wmb.65.1465993124788; Wed, 15 Jun 2016 05:18:44 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id jf3sm7450242wjb.41.2016.06.15.05.18.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2016 05:18:43 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Subject: [PATCH 05/44] drm: Automatically register/unregister all connectors Date: Wed, 15 Jun 2016 13:17:50 +0100 Message-Id: <1465993109-19523-6-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> References: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> X-Originally-To: chris@chris-wilson.co.uk X-SRS-Rewrite: SMTP reverse-path rewritten from by svcemlmxl12.netnames.net X-To-Not-Matched: true X-Originating-IP: 185.26.230.76 X-Country: code=GB country="United Kingdom" ip=185.26.230.76 X-ORBS-Accept: dnswl_none X-Rcpt-To: X-FriendScore: : 0.0 sd=0.0 Close nspam=0 nok=1 0.00 $0.03(X-SpamContent:clean) $0.95(X-myrbl:Color=brown) $0.08(dnswl_none) $0.20(X-Phrase:clean) $0.77(From isn't in return path) $0.39(X-To-Not-Matched:true) $0.41(X-LangGuess:English) X-SpamContent: Clean X-LangGuess: English X-Probe: +OK skipped, known ip address X-Phrase: Clean score=0.00 X-Avast: Message is clean X-X-MyRbl: Color=Brown Age=0 Spam=3 Notspam=0 Stars=2 Good=65 Friend=47 Surbl=0 Catch=0 r=0.62 ip=185.26.230.76 X-IP-stats: Incoming Last 0, First 686, in=121479, out=0, spam=0 ip=185.26.230.76 X-To-Not-Matched: true Cc: 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 As the drm_connector is now safe for multiple calls to register/unregister, automatically perform a registration on all known connectors drm drv_register (and unregister from drm_drv_unregister). Drivers can still call drm_connector_register() and drm_connector_unregister() individually, or defer as required. Signed-off-by: Chris Wilson --- drivers/gpu/drm/drm_crtc.c | 6 +++--- drivers/gpu/drm/drm_drv.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 316dea9bea08..e7c862bd2f19 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1047,9 +1047,9 @@ EXPORT_SYMBOL(drm_connector_unregister); * @dev: drm device * * This function registers all connectors in sysfs and other places so that - * userspace can start to access them. Drivers can call it after calling - * drm_dev_register() to complete the device registration, if they don't call - * drm_connector_register() on each connector individually. + * userspace can start to access them. drm_connector_register_all() is called + * automatically from drm_dev_register() to complete the device registration, + * if they don't call drm_connector_register() on each connector individually. * * When a device is unplugged and should be removed from userspace access, * call drm_connector_unregister_all(), which is the inverse of this diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index d5c458b1a3b2..13b4c9c0fe36 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -758,11 +758,7 @@ EXPORT_SYMBOL(drm_dev_unref); * * Register the DRM device @dev with the system, advertise device to user-space * and start normal device operation. @dev must be allocated via drm_dev_alloc() - * previously. Right after drm_dev_register() the driver should call - * drm_connector_register_all() to register all connectors in sysfs. This is - * a separate call for backward compatibility with drivers still using - * the deprecated ->load() callback, where connectors are registered from within - * the ->load() callback. + * previously. * * Never call this twice on any device! * @@ -799,6 +795,8 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) goto err_minors; } + drm_connector_register_all(dev); + ret = 0; goto out_unlock; @@ -829,6 +827,8 @@ void drm_dev_unregister(struct drm_device *dev) drm_lastclose(dev); + drm_connector_unregister_all(dev); + if (dev->driver->unload) dev->driver->unload(dev);