From patchwork Wed Jun 15 12:17:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9178341 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 B2B016021C for ; Wed, 15 Jun 2016 12:18:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A336C27BFC for ; Wed, 15 Jun 2016 12:18:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97A9327CEA; Wed, 15 Jun 2016 12:18:49 +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 193F227BFC for ; Wed, 15 Jun 2016 12:18:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DFF586E905; Wed, 15 Jun 2016 12:18:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 710EC6E912; Wed, 15 Jun 2016 12:18:43 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id 187so3568655wmz.1; Wed, 15 Jun 2016 05:18:43 -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=hKqZ78umZWX+Pp6GB2LMdXAki69IJfmuVKzUBM4ck+Y=; b=j3+LqAGLOkHSkMzssCJG36oGg2pPZWJMSfTitLxwAiMshJuFrSoPIEDFlxvJuE66GG Pvs8MOYjhX+jTlUL1tYIToehDfTQta3F2o4K31k6+dDHzSyKCDSzZ6iwMnj7x4+63wA/ SwgDLmmelHiSMSsKBz4ePsLmCz5am+PqmVaUeQnrazZ1xFarA47Sx5i4STduahIyvPvd +TFHXJVC0TRELrQKLpmbg+bLsoKCm3uZpxIgKgrNQO7Xn5VOgISeJGHWYzkQV/319kRI k7qX9wbuEmCjumzjMkVvNCVZ809/NOTBqPXw2D9ubWIXMpwVQNvSccKRCKILI/JYQ68I DX9g== 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=hKqZ78umZWX+Pp6GB2LMdXAki69IJfmuVKzUBM4ck+Y=; b=B8KEjZzcVTnrZiZqveDF9kCxz9VTSEDeBoF9qcuxsSReBIsfjrGYCbbWWo4ylKJjse 2OquPpIXztTT/qpv/SGHm32f/VS/3F8F1W3qS1ObtLENob2pVP6nOWq50pPUTEhEWKlS 2lEhttlO/Kkei8zwx+O/YcUxVXIi/a4ulrftN1yIH5G8E35h5xwM59bzfpaXPI/pheTm zf/pKVsogrEJ4OV9i69W7a+M2E7jOtml9QUqTpL5/0/dR/yCQMKMnYAJv+tGyvQi8pIW 6Oho7UfXuy6Ok3z7v9uKnJHvmUd3nU//PtO8aqI8GJE+j1gsxS51DoiQTaqiitHwNil0 GgLQ== X-Gm-Message-State: ALyK8tKdyik9est9uVqJrKYaaZQlXxHLuth1CcVdcPibtb6MQedpCtLiPbpnrN2FQTnuHw== X-Received: by 10.194.88.5 with SMTP id bc5mr12171525wjb.100.1465993121359; Wed, 15 Jun 2016 05:18:41 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2016 05:18:40 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Subject: [PATCH 02/44] drm: Add a callback from connector registering Date: Wed, 15 Jun 2016 13:17:47 +0100 Message-Id: <1465993109-19523-3-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 , Dave Airlie , dri-devel@lists.freedesktop.org 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 If a driver wants to more precisely control its initialisation and in particular, defer registering its interfaces with userspace until after everything is setup, it also needs to defer registering the connectors. As some devices need more work during registration, add a callback so that drivers can do additional work if required for a connector. Correspondingly, we also require an unregister callback. Signed-off-by: Chris Wilson Cc: Dave Airlie Cc: Daniel Vetter Cc: dri-devel@lists.freedesktop.org Reviewed-by: Daniel Vetter --- drivers/gpu/drm/drm_crtc.c | 18 ++++++++++++++++-- include/drm/drm_crtc.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 4ec35f9e6de5..23dfec41decb 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -990,13 +990,24 @@ int drm_connector_register(struct drm_connector *connector) ret = drm_debugfs_connector_add(connector); if (ret) { - drm_sysfs_connector_remove(connector); - return ret; + goto err_sysfs; + } + + if (connector->funcs->late_register) { + ret = connector->funcs->late_register(connector); + if (ret) + goto err_debugfs; } drm_mode_object_register(connector->dev, &connector->base); return 0; + +err_debugfs: + drm_debugfs_connector_remove(connector); +err_sysfs: + drm_sysfs_connector_remove(connector); + return ret; } EXPORT_SYMBOL(drm_connector_register); @@ -1008,6 +1019,9 @@ EXPORT_SYMBOL(drm_connector_register); */ void drm_connector_unregister(struct drm_connector *connector) { + if (connector->funcs->early_unregister) + connector->funcs->early_unregister(connector); + drm_sysfs_connector_remove(connector); drm_debugfs_connector_remove(connector); } diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 914baa8c161d..0c35b4f73e4c 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -957,6 +957,34 @@ struct drm_connector_funcs { uint64_t val); /** + * @late_register: + * + * This optional hook can be used to register additional userspace + * interfaces attached to the connector, light backlight control, i2c, + * DP aux or similar interfaces. It is called late in the driver load + * sequence from drm_connector_register() when registering all the + * core drm connector interfaces. Everything added from this callback + * should be unregistered in the early_unregister callback. + * + * Returns: + * + * 0 on success, or a negative error code on failure. + * + */ + int (*late_register)(struct drm_connector *connector); + + /** + * @early_unregister: + * + * This optional hook should be used to unregister the additional + * userspace interfaces attached to the connector from + * late_unregister(). It is called from drm_connector_unregister(), + * early in the driver unload sequence to disable userspace access + * before data structures are torndown. + */ + void (*early_unregister)(struct drm_connector *connector); + + /** * @destroy: * * Clean up connector resources. This is called at driver unload time