From patchwork Wed Apr 1 10:09:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 6139051 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F29899F2EC for ; Wed, 1 Apr 2015 10:14:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18771202F0 for ; Wed, 1 Apr 2015 10:14:42 +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 24FC5202EB for ; Wed, 1 Apr 2015 10:14:41 +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 1YdFfT-0000so-V4; Wed, 01 Apr 2015 10:14:39 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YdFbm-0007AJ-GA; Wed, 01 Apr 2015 10:10:50 +0000 Received: from gloria.sntech.de ([95.129.55.99]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YdFbh-0000y5-Kn; Wed, 01 Apr 2015 10:10:48 +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-5j; 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 01/12] drm/encoder: add functionality to register encoders to a global list Date: Wed, 1 Apr 2015 12:09:35 +0200 Message-Id: <1427882986-19110-2-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_061045_828456_49813085 X-CRM114-Status: GOOD ( 11.53 ) X-Spam-Score: -1.9 (-) 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 encoders 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 encoders that are part of a bigger component. Signed-off-by: Heiko Stuebner --- drivers/gpu/drm/drm_crtc.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/drm/drm_crtc.h | 8 ++++++++ 2 files changed, 49 insertions(+) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index f6d04c7..b63e69d 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1066,6 +1066,47 @@ void drm_connector_unplug_all(struct drm_device *dev) } EXPORT_SYMBOL(drm_connector_unplug_all); +static DEFINE_MUTEX(encoder_lock); +static LIST_HEAD(encoder_list); + +int drm_encoder_add(struct drm_encoder *encoder) +{ + mutex_lock(&encoder_lock); + list_add_tail(&encoder->list, &encoder_list); + mutex_unlock(&encoder_lock); + + return 0; +} +EXPORT_SYMBOL(drm_encoder_add); + +void drm_encoder_remove(struct drm_encoder *encoder) +{ + mutex_lock(&encoder_lock); + list_del_init(&encoder->list); + mutex_unlock(&encoder_lock); +} +EXPORT_SYMBOL(drm_encoder_remove); + +#ifdef CONFIG_OF +struct drm_encoder *of_drm_find_encoder(struct device_node *np) +{ + struct drm_encoder *encoder; + + mutex_lock(&encoder_lock); + + list_for_each_entry(encoder, &encoder_list, list) { + if (encoder->of_node == np) { + mutex_unlock(&encoder_lock); + return encoder; + } + } + + mutex_unlock(&encoder_lock); + return NULL; +} +EXPORT_SYMBOL(of_drm_find_encoder); +#endif + /** * drm_encoder_init - Init a preallocated encoder * @dev: drm device diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 920e21a..76994ba 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -569,6 +569,7 @@ struct drm_encoder_funcs { /** * struct drm_encoder - central DRM encoder structure * @dev: parent DRM device + * @of_node: device node pointer to the bridge * @head: list management * @base: base KMS object * @name: encoder name @@ -585,6 +586,10 @@ struct drm_encoder_funcs { */ struct drm_encoder { struct drm_device *dev; +#ifdef CONFIG_OF + struct device_node *of_node; +#endif + struct list_head list; struct list_head head; struct drm_mode_object base; @@ -1225,6 +1230,9 @@ extern void drm_bridge_remove(struct drm_bridge *bridge); extern struct drm_bridge *of_drm_find_bridge(struct device_node *np); extern int drm_bridge_attach(struct drm_device *dev, struct drm_bridge *bridge); +extern int drm_encoder_add(struct drm_encoder *encoder); +extern void drm_encoder_remove(struct drm_encoder *encoder); +extern struct drm_encoder *of_drm_find_encoder(struct device_node *np); extern int drm_encoder_init(struct drm_device *dev, struct drm_encoder *encoder, const struct drm_encoder_funcs *funcs,