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: 9178385 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 9F5B46021C for ; Wed, 15 Jun 2016 12:19:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D81227DA4 for ; Wed, 15 Jun 2016 12:19:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 829C927DCE; Wed, 15 Jun 2016 12:19: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 3BEC327CEA for ; Wed, 15 Jun 2016 12:19:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F4BF6E92E; Wed, 15 Jun 2016 12:19:04 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A5FD26E912 for ; Wed, 15 Jun 2016 12:18:46 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id 187so3568967wmz.1 for ; Wed, 15 Jun 2016 05:18:46 -0700 (PDT) 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=NdBOhHZFouy+3zbqZiI+Hqs9u+BNfAHb7BrGZZUbN+w55dZnek5sZRIS8GcCrWr/N+ 6Qj6VSm5WcLVg1RfMSoPzQyOEOAUF0i/TNbLdQaK7iMHkIguhWUA9hkSfkCTp80yiQ2D rafJI5J46DXeOQl8420yDCIJWU6WBdPbXn5YiMgzmlItyq24KBLcYcjeUZzabRj7LPNe 4D7KtcjVeTbN6N3W5V7YXE3j2gAAYwN1E0FaAFJPVWo3/kuKft/icnAM3tlvXy6X13vh PCB2opLilMtx4Zc7Vj3M7aC/qlbh0dE+apshYevGkF1IfjMdqTGgt/Rt/QVwTeC54iD+ 7lHw== X-Gm-Message-State: ALyK8tIePvi4RT/bwP0qOAjjt73DNN1bB/vK5g/6RJOmJd4B91OhV5kOD+a4InCsrHzvXg== 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 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> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 05/44] drm: Automatically register/unregister all connectors 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 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);