From patchwork Wed Apr 1 10:09:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 6138961 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C0B53BF4A6 for ; Wed, 1 Apr 2015 10:10:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDBFF202EC for ; Wed, 1 Apr 2015 10:10:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 09A0420148 for ; Wed, 1 Apr 2015 10:10:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YdFbS-00070J-RJ; Wed, 01 Apr 2015 10:10:30 +0000 Received: from gloria.sntech.de ([95.129.55.99]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YdFbK-0005cj-5B; Wed, 01 Apr 2015 10:10:25 +0000 Received: from ip92344031.dynamic.kabel-deutschland.de ([146.52.64.49] helo=diego.lan) by gloria.sntech.de with esmtpsa (TLS1.1:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YdFap-0002on-IB; Wed, 01 Apr 2015 12:09:51 +0200 From: Heiko Stuebner To: airlied@linux.ie, mark.yao@rock-chips.com, laurent.pinchart@ideasonboard.com Subject: [PATCH RFC v2 02/12] drm/connector: add functionality to register connectors to a global list Date: Wed, 1 Apr 2015 12:09:36 +0200 Message-Id: <1427882986-19110-3-git-send-email-heiko@sntech.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427882986-19110-1-git-send-email-heiko@sntech.de> References: <1427882986-19110-1-git-send-email-heiko@sntech.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150401_031022_398133_6C73B913 X-CRM114-Status: UNSURE ( 9.79 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: devicetree@vger.kernel.org, Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, robdclark@gmail.com, djkurtz@chromium.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This allows standalone connectors to be registered and found again through their devicetree node when going through their connection graph. Setting the of_node property is of course still optional, as it is not necessary in most cases to lookup connectors that are part of a bigger component. Signed-off-by: Heiko Stuebner --- drivers/gpu/drm/drm_crtc.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/drm/drm_crtc.h | 7 +++++++ 2 files changed, 48 insertions(+) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index b63e69d..8b49ea7 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -852,6 +852,47 @@ static void drm_connector_get_cmdline_mode(struct drm_connector *connector) mode->interlace ? " interlaced" : ""); } +static DEFINE_MUTEX(connector_lock); +static LIST_HEAD(connector_list); + +int drm_connector_add(struct drm_connector *connector) +{ + mutex_lock(&connector_lock); + list_add_tail(&connector->list, &connector_list); + mutex_unlock(&connector_lock); + + return 0; +} +EXPORT_SYMBOL(drm_connector_add); + +void drm_connector_remove(struct drm_connector *connector) +{ + mutex_lock(&connector_lock); + list_del_init(&connector->list); + mutex_unlock(&connector_lock); +} +EXPORT_SYMBOL(drm_connector_remove); + +#ifdef CONFIG_OF +struct drm_connector *of_drm_find_connector(struct device_node *np) +{ + struct drm_connector *connector; + + mutex_lock(&connector_lock); + + list_for_each_entry(connector, &connector_list, list) { + if (connector->of_node == np) { + mutex_unlock(&connector_lock); + return connector; + } + } + + mutex_unlock(&connector_lock); + return NULL; +} +EXPORT_SYMBOL(of_drm_find_connector); +#endif + /** * drm_connector_init - Init a preallocated connector * @dev: DRM device diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 76994ba..37b230b 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -671,6 +671,10 @@ struct drm_encoder { */ struct drm_connector { struct drm_device *dev; +#ifdef CONFIG_OF + struct device_node *of_node; +#endif + struct list_head list; struct device *kdev; struct device_attribute *attr; struct list_head head; @@ -1213,6 +1217,9 @@ static inline uint32_t drm_crtc_mask(struct drm_crtc *crtc) extern void drm_connector_ida_init(void); extern void drm_connector_ida_destroy(void); +extern int drm_connector_add(struct drm_connector *connector); +extern void drm_connector_remove(struct drm_connector *connector); +extern struct drm_connector *of_drm_find_connector(struct device_node *np); extern int drm_connector_init(struct drm_device *dev, struct drm_connector *connector, const struct drm_connector_funcs *funcs,