From patchwork Wed Mar 22 13:26:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 95719 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp237942qgd; Wed, 22 Mar 2017 06:28:09 -0700 (PDT) X-Received: by 10.98.194.157 with SMTP id w29mr45962913pfk.192.1490189289734; Wed, 22 Mar 2017 06:28:09 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s25si1855611pge.40.2017.03.22.06.28.09; Wed, 22 Mar 2017 06:28:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759771AbdCVN2C (ORCPT + 12 others); Wed, 22 Mar 2017 09:28:02 -0400 Received: from mail-ot0-f194.google.com ([74.125.82.194]:33144 "EHLO mail-ot0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934601AbdCVN01 (ORCPT ); Wed, 22 Mar 2017 09:26:27 -0400 Received: by mail-ot0-f194.google.com with SMTP id i50so16104223otd.0 for ; Wed, 22 Mar 2017 06:26:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TOys5DgybzPODRdK3BnI+jKnphjXqOv/r3SeaxNj/Nk=; b=a6GGoySkYNx4TnmNV7cph4UMNQtq95WsBLbhuXheXGutjru7W+8K+IJxVHmqiCa/IS y3nRp/nVH75I+6PMcFnFjdevTuvT8X+HbqMHUIWhXzCrUXl43ywSrmiX/WPjRuIoDTn2 9h2Qr2SPhp9WO8fZELAF3y3AqkgcRoZB256WeEx7ImgamVrGTSkyEEK58VmSLuTPb1n0 QuC6tTrfA27+oT0nHEgNRbFVPPRCvTt31QWBQ1I5BDIluo1wz+TBFElk8uiN71j6J+lH ja8AX66Vypj7OUUg/NgtKu5kHrrbrU3DDs76OR9c/Xtpyx6Yatr6Thl+NjYn78qHOV6q fOSQ== X-Gm-Message-State: AFeK/H3DjhwGKRAHQQBF7mnxZj95Fp7qvMHI5CaVWPxqPRC8WpYl0APboV+qp1L+lkqo7w== X-Received: by 10.157.8.9 with SMTP id 9mr2727262oty.69.1490189175923; Wed, 22 Mar 2017 06:26:15 -0700 (PDT) Received: from rob-hp-laptop.herring.priv (66-90-148-125.dyn.grandenetworks.net. [66.90.148.125]) by smtp.googlemail.com with ESMTPSA id x133sm509132oif.33.2017.03.22.06.26.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 06:26:15 -0700 (PDT) From: Rob Herring To: David Airlie , Daniel Vetter , Sean Paul Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Boris Brezillon , Archit Taneja , Jingoo Han , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Kukjin Kim , Krzysztof Kozlowski , Javier Martinez Canillas , Stefan Agner , Alison Wang , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , Philipp Zabel , CK Hu , Matthias Brugger , Marek Vasut , Mark Yao , Heiko Stuebner , Maxime Ripard , Chen-Yu Tsai , Liviu Dudau , Mali DP Maintainers , Neil Armstrong , Carlo Caione , Kevin Hilman , Rob Clark , Jyri Sarha , Tomi Valkeinen , Eric Anholt , Russell King Subject: [PATCH v3 2/5] drm: of: introduce drm_of_find_panel_or_bridge Date: Wed, 22 Mar 2017 08:26:05 -0500 Message-Id: <20170322132608.17353-3-robh@kernel.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170322132608.17353-1-robh@kernel.org> References: <20170322132608.17353-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Many drivers have a common pattern of searching the OF graph for either an attached panel or bridge and then finding the DRM struct for the panel or bridge. Also, most drivers need to handle deferred probing when the DRM device is not yet instantiated. Create a common function, drm_of_find_panel_or_bridge, to find the connected node and the associated DRM panel or bridge device. Signed-off-by: Rob Herring Acked-by: Philipp Zabel --- v3: - rebase to v4.11-rc2 - fix comment that DT node is encoder ouput ports drivers/gpu/drm/drm_of.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_of.h | 13 ++++++++++++ 2 files changed, 65 insertions(+) -- 2.10.1 Tested-by: Philipp Zabel diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index b5f2f0fece99..2120f33bdf4a 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -3,8 +3,10 @@ #include #include #include +#include #include #include +#include #include static void drm_release_of(struct device *dev, void *data) @@ -208,3 +210,53 @@ int drm_of_encoder_active_endpoint(struct device_node *node, return -EINVAL; } EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint); + +/* + * drm_of_find_panel_or_bridge - return connected panel or bridge device + * @np: device tree node containing encoder output ports + * @panel: pointer to hold returned drm_panel + * @bridge: pointer to hold returned drm_bridge + * + * Given a DT node's port and endpoint number, find the connected node and + * return either the associated struct drm_panel or drm_bridge device. Either + * @panel or @bridge must not be NULL. + * + * Returns zero if successful, or one of the standard error codes if it fails. + */ +int drm_of_find_panel_or_bridge(const struct device_node *np, + int port, int endpoint, + struct drm_panel **panel, + struct drm_bridge **bridge) +{ + int ret = -EPROBE_DEFER; + struct device_node *remote; + + if (!panel && !bridge) + return -EINVAL; + + remote = of_graph_get_remote_node(np, port, endpoint); + if (!remote) + return -ENODEV; + + if (panel) { + *panel = of_drm_find_panel(remote); + if (*panel) + ret = 0; + } + + /* No panel found yet, check for a bridge next. */ + if (bridge) { + if (ret) { + *bridge = of_drm_find_bridge(remote); + if (*bridge) + ret = 0; + } else { + *bridge = NULL; + } + + } + + of_node_put(remote); + return ret; +} +EXPORT_SYMBOL_GPL(drm_of_find_panel_or_bridge); diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index 26a64805cc15..f86507f0599b 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -8,6 +8,8 @@ struct component_match; struct device; struct drm_device; struct drm_encoder; +struct drm_panel; +struct drm_bridge; struct device_node; #ifdef CONFIG_OF @@ -23,6 +25,10 @@ extern int drm_of_component_probe(struct device *dev, extern int drm_of_encoder_active_endpoint(struct device_node *node, struct drm_encoder *encoder, struct of_endpoint *endpoint); +extern int drm_of_find_panel_or_bridge(const struct device_node *np, + int port, int endpoint, + struct drm_panel **panel, + struct drm_bridge **bridge); #else static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, struct device_node *port) @@ -52,6 +58,13 @@ static inline int drm_of_encoder_active_endpoint(struct device_node *node, { return -EINVAL; } +static inline int drm_of_find_panel_or_bridge(const struct device_node *np, + int port, int endpoint, + struct drm_panel **panel, + struct drm_bridge **bridge) +{ + return -EINVAL; +} #endif static inline int drm_of_encoder_active_endpoint_id(struct device_node *node,