DRM OF graph clean-up
Subsystems (28)
Rob Herring
maintainercover DRM OF graph clean-up
I've been unhappy with the OF graph API for some time and decided to do something about it. The problem is drivers have to do too much of the graph parsing and walking themselves. This has led to the same pattern duplicated over and over. This series adds 2 new helpers and adapts DRM drivers to use them. It only adds one new graph helper, but reduces the use of the others which I hope to remove at some point. But we're not there yet.
There's a few other things I'd like to clean-up.
The Armada and Rockchip drivers remain oddballs with their own graph parsing. I can't see how the armada driver even can work. There's nothing to instantiate the armada-drm device either in DT or the kernel.
The omapdrm driver still has some custom helpers similar to the common ones, but still slightly different. It got to be more changes than I wanted to make to address.
Build tested only (and probably not every last driver).
Rob
Rob Herring (5):
of: introduce of_graph_get_remote_node
drm: of: introduce drm_of_find_panel_or_bridge
drm: convert drivers to use of_graph_get_remote_node
drm: convert drivers to use drm_of_find_panel_or_bridge
drm: omap: use common OF graph helpers
drivers/gpu/drm/arm/hdlcd_drv.c | 22 +---- drivers/gpu/drm/arm/malidp_drv.c | 29 +------ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 64 +++----------- drivers/gpu/drm/bridge/adv7511/adv7533.c | 12 +-- drivers/gpu/drm/bridge/dumb-vga-dac.c | 15 +--- drivers/gpu/drm/bridge/nxp-ptn3460.c | 16 +--- drivers/gpu/drm/bridge/parade-ps8622.c | 16 +--- drivers/gpu/drm/bridge/tc358767.c | 27 +----- drivers/gpu/drm/bridge/ti-tfp410.c | 15 ++-- drivers/gpu/drm/drm_of.c | 50 +++++++++++ drivers/gpu/drm/exynos/exynos_dp.c | 35 +++----- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 16 +--- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 +-- drivers/gpu/drm/exynos/exynos_drm_mic.c | 27 +----- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 49 ++++------- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 27 +----- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 30 +------ drivers/gpu/drm/imx/imx-ldb.c | 28 ++----- drivers/gpu/drm/imx/parallel-display.c | 35 +------- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 +-- drivers/gpu/drm/mediatek/mtk_dsi.c | 23 ++--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 +----- drivers/gpu/drm/meson/meson_drv.c | 12 +-- drivers/gpu/drm/meson/meson_venc_cvbs.c | 19 +---- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +------ drivers/gpu/drm/mxsfb/mxsfb_out.c | 36 ++------ drivers/gpu/drm/omapdrm/dss/dpi.c | 2 +- drivers/gpu/drm/omapdrm/dss/dsi.c | 2 +- drivers/gpu/drm/omapdrm/dss/dss-of.c | 102 +---------------------- drivers/gpu/drm/omapdrm/dss/dss.c | 61 +++----------- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 3 +- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- drivers/gpu/drm/omapdrm/dss/omapdss.h | 11 --- drivers/gpu/drm/omapdrm/dss/venc.c | 3 +- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 26 +----- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 18 ++-- drivers/gpu/drm/sun4i/sun4i_rgb.c | 17 ++-- drivers/gpu/drm/sun4i/sun4i_tcon.c | 90 ++------------------ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 11 +-- drivers/gpu/drm/tilcdc/tilcdc_external.c | 66 ++------------- drivers/gpu/drm/vc4/vc4_dpi.c | 15 +--- drivers/of/base.c | 28 +++++++ include/drm/drm_of.h | 13 +++ include/linux/of_graph.h | 8 ++ 45 files changed, 272 insertions(+), 891 deletions(-)
Signature · 6 lines
2.10.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Rob Herring
maintainerPATCH 1/5 of: introduce of_graph_get_remote_node
The OF graph API leaves too much of the graph walking to clients when in many cases the driver doesn't care about accessing the port or endpoint nodes. The drivers typically just want the device connected via a particular graph connection. of_graph_get_remote_node provides this functionality.
--- drivers/of/base.c | 28 ++++++++++++++++++++++++++++ include/linux/of_graph.h | 8 ++++++++ 2 files changed, 36 insertions(+)
drivers/of/base.c +28 -0
@@ -2469,3 +2469,31 @@ struct device_node *of_graph_get_remote_port(const struct device_node *node)return of_get_next_parent (np); }EXPORT_SYMBOL (of_graph_get_remote_port); + +struct device_node *of_graph_get_remote_node (const struct device_node *node, +int port,int endpoint) +{ +struct device_node *endpoint_node, *remote; + + endpoint_node =of_graph_get_endpoint_by_regs (node, port, endpoint); +if (!endpoint_node) { +pr_debug ("no valid endpoint (%d, %d) for node %s\n" , + port, endpoint, node->full_name); +return NULL ; + } + + remote =of_graph_get_remote_port_parent (endpoint_node); +of_node_put (endpoint); +if (!remote) { +pr_debug ("no valid remote node\n" ); +return NULL ; + } + +if (!of_device_is_available (remote)) { +pr_debug ("not available for remote node\n" ); +return NULL ; + } + +return remote; +} +EXPORT_SYMBOL (of_graph_get_remote_node);
include/linux/of_graph.h +8 -0
@@ -51,6 +51,8 @@ struct device_node *of_graph_get_endpoint_by_regs(struct device_node *of_graph_get_remote_port_parent (const struct device_node *node);struct device_node *of_graph_get_remote_port (const struct device_node *node); +struct device_node *of_graph_get_remote_node (const struct device_node *node, +int port,int endpoint);#else static inline int of_graph_parse_endpoint(const struct device_node *node,
@@ -89,6 +91,12 @@ static inline struct device_node *of_graph_get_remote_port( {return NULL ; } +static inline struct device_node *of_graph_get_remote_node ( +const struct device_node *node, +int port,int endpoint) +{ +return NULL ; +}#endif /* CONFIG_OF */
Signature · 1 line
2.10.1
Rob Herring
maintainerPATCH 2/5 drm: of: introduce drm_of_find_panel_or_bridge
In reply to Rob HerringMany 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.
--- drivers/gpu/drm/drm_of.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_of.h | 13 +++++++++++++ 2 files changed, 63 insertions(+)
drivers/gpu/drm/drm_of.c +50 -0
@@ -3,7 +3,9 @@#include <linux/list.h> #include <linux/of_graph.h> #include <drm/drmP.h> +#include <drm/drm_bridge.h> #include <drm/drm_crtc.h> +#include <drm/drm_panel.h> #include <drm/drm_of.h> static void drm_release_of (struct device *dev,void *data)
@@ -207,3 +209,51 @@ 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 input 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. +* +* 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 = -ENODEV ; +struct device_node *remote; + + remote =of_graph_get_remote_node (np, port, endpoint); +if (!remote) +return -ENODEV ; + +if (bridge) + *bridge =NULL ; + +if (panel) { + *panel =of_drm_find_panel (remote); +if (*panel) { + ret =0 ; + goto out_put; + } + ret = -EPROBE_DEFER ; + } + +if (bridge) { + *bridge =of_drm_find_bridge (remote); +if (*bridge) + ret =0 ; +else + ret = -EPROBE_DEFER ; + } +out_put: +of_node_put (remote); +return ret; +} +EXPORT_SYMBOL_GPL (drm_of_find_panel_or_bridge);
include/drm/drm_of.h +13 -0
@@ -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,
Signature · 1 line
2.10.1
Rob Herring
maintainerPATCH 3/5 drm: convert drivers to use of_graph_get_remote_node
In reply to Rob HerringConvert drivers to use the new of_graph_get_remote_node() helper instead of parsing the endpoint node and then getting the remote device node. Now drivers can just specify the device node and which port/endpoint and get back the connected remote device node. The details of the graph binding are nicely abstracted into the core OF graph code.
This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
--- drivers/gpu/drm/arm/hdlcd_drv.c | 22 ++------- drivers/gpu/drm/arm/malidp_drv.c | 29 ++--------- drivers/gpu/drm/bridge/adv7511/adv7533.c | 12 +---- drivers/gpu/drm/bridge/dumb-vga-dac.c | 15 ++---- drivers/gpu/drm/bridge/ti-tfp410.c | 15 ++---- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 16 +----- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 ++--- drivers/gpu/drm/exynos/exynos_drm_mic.c | 27 +--------- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 26 ++-------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 30 +---------- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 ++-------- drivers/gpu/drm/meson/meson_drv.c | 12 ++--- drivers/gpu/drm/meson/meson_venc_cvbs.c | 19 ++----- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +---------- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 18 +++---- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 11 +---- drivers/gpu/drm/tilcdc/tilcdc_external.c | 66 +++---------------------- drivers/gpu/drm/vc4/vc4_dpi.c | 15 ++---- 20 files changed, 64 insertions(+), 351 deletions(-)
drivers/gpu/drm/arm/hdlcd_drv.c +3 -19
@@ -430,29 +430,13 @@ static int compare_dev(struct device *dev, void *data)static int hdlcd_probe (struct platform_device *pdev) { -struct device_node *port, *ep; +struct device_node *port;struct component_match *match =NULL ; -if (!pdev->dev.of_node) -return -ENODEV ; -/* there is only one output port inside each device, find it */ - ep =of_graph_get_next_endpoint (pdev->dev.of_node,NULL ); -if (!ep) -return -ENODEV ; - -if (!of_device_is_available (ep)) { -of_node_put (ep); + port =of_graph_get_remote_node (pdev->dev.of_node,0 ,0 ); +if (!port)return -ENODEV ; - } - -/* add the remote encoder port as component */ - port =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!port || !of_device_is_available (port)) { -of_node_put (port); -return -EAGAIN ; - }drm_of_component_match_add (&pdev->dev, &match, compare_dev, port);of_node_put (port);
drivers/gpu/drm/arm/malidp_drv.c +4 -25
@@ -262,7 +262,6 @@ static int malidp_bind(struct device *dev) {struct resource *res;struct drm_device *drm; -struct device_node *ep;struct malidp_drm *malidp;struct malidp_hw_device *hwdev;struct platform_device *pdev =to_platform_device (dev);
@@ -360,12 +359,7 @@ static int malidp_bind(struct device *dev) goto init_fail;/* Set the CRTC's port so that the encoder component can find it */ - ep =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (!ep) { - ret = -EINVAL ; - goto port_fail; - } - malidp->crtc.port =of_get_next_parent (ep); + malidp->crtc.port =of_graph_get_port_by_id (dev->of_node,0 ); ret =component_bind_all (dev, drm);if (ret) {
@@ -418,9 +412,7 @@ static int malidp_bind(struct device *dev) irq_init_fail:component_unbind_all (dev, drm); bind_fail: -of_node_put (malidp->crtc.port); malidp->crtc.port =NULL ; -port_fail:malidp_fini (drm); init_fail: drm->dev_private =NULL ;
@@ -478,29 +470,16 @@ static int malidp_compare_dev(struct device *dev, void *data)static int malidp_platform_probe (struct platform_device *pdev) { -struct device_node *port, *ep; +struct device_node *port;struct component_match *match =NULL ;if (!pdev->dev.of_node)return -ENODEV ;/* there is only one output port inside each device, find it */ - ep =of_graph_get_next_endpoint (pdev->dev.of_node,NULL ); -if (!ep) -return -ENODEV ; - -if (!of_device_is_available (ep)) { -of_node_put (ep); + port =of_graph_get_remote_node (pdev->dev.of_node,0 ,0 ); +if (!port)return -ENODEV ; - } - -/* add the remote encoder port as component */ - port =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!port || !of_device_is_available (port)) { -of_node_put (port); -return -EAGAIN ; - }drm_of_component_match_add (&pdev->dev, &match, malidp_compare_dev, port);
drivers/gpu/drm/bridge/adv7511/adv7533.c +2 -10
@@ -232,7 +232,6 @@ void adv7533_detach_dsi(struct adv7511 *adv)int adv7533_parse_dt (struct device_node *np,struct adv7511 *adv) {u32 num_lanes; -struct device_node *endpoint;of_property_read_u32 (np,"adi,dsi-lanes" , &num_lanes);
@@ -241,17 +240,10 @@ int adv7533_parse_dt(struct device_node *np, struct adv7511 *adv) adv->num_dsi_lanes = num_lanes; - endpoint =of_graph_get_next_endpoint (np,NULL ); -if (!endpoint) + adv->host_node =of_graph_get_remote_node (np,0 ,0 ); +if (!adv->host_node)return -ENODEV ; - adv->host_node =of_graph_get_remote_port_parent (endpoint); -if (!adv->host_node) { -of_node_put (endpoint); -return -ENODEV ; - } - -of_node_put (endpoint);of_node_put (adv->host_node); adv->use_timing_gen = !of_property_read_bool(np,
drivers/gpu/drm/bridge/dumb-vga-dac.c +3 -12
@@ -154,21 +154,12 @@ static const struct drm_bridge_funcs dumb_vga_bridge_funcs = {static struct i2c_adapter *dumb_vga_retrieve_ddc (struct device *dev) { -struct device_node *end_node, *phandle, *remote; +struct device_node *phandle, *remote;struct i2c_adapter *ddc; - end_node =of_graph_get_endpoint_by_regs (dev->of_node,1 ,-1 ); -if (!end_node) { -dev_err (dev,"Missing connector endpoint\n" ); -return ERR_PTR (-ENODEV ); - } - - remote =of_graph_get_remote_port_parent (end_node); -of_node_put (end_node); -if (!remote) { -dev_err (dev,"Enable to parse remote node\n" ); + remote =of_graph_get_remote_node (dev->of_node,1 ,-1 ); +if (!remote)return ERR_PTR (-EINVAL ); - } phandle =of_parse_phandle (remote,"ddc-i2c-bus" ,0 );of_node_put (remote);
drivers/gpu/drm/bridge/ti-tfp410.c +5 -10
@@ -127,18 +127,13 @@ static const struct drm_bridge_funcs tfp410_bridge_funcs = {static int tfp410_get_connector_ddc (struct tfp410 *dvi) { -struct device_node *ep =NULL , *connector_node =NULL ; -struct device_node *ddc_phandle =NULL ; +struct device_node *connector_node, *ddc_phandle;int ret =0 ;/* port@1 is the connector node */ - ep =of_graph_get_endpoint_by_regs (dvi->dev->of_node,1 ,-1 ); -if (!ep) - goto fail; - - connector_node =of_graph_get_remote_port_parent (ep); + connector_node =of_graph_get_remote_node (dvi->dev->of_node,1 ,-1 );if (!connector_node) - goto fail; +return -ENODEV ; ddc_phandle =of_parse_phandle (connector_node,"ddc-i2c-bus" ,0 );if (!ddc_phandle)
@@ -150,10 +145,10 @@ static int tfp410_get_connector_ddc(struct tfp410 *dvi)else ret = -EPROBE_DEFER ; +of_node_put (ddc_phandle); + fail: -of_node_put (ep);of_node_put (connector_node); -of_node_put (ddc_phandle);return ret; }
drivers/gpu/drm/exynos/exynos_drm_dpi.c +1 -15
@@ -164,27 +164,13 @@ enum { FIMD_PORT_WRB, }; -static struct device_node *exynos_dpi_of_find_panel_node (struct device *dev) -{ -struct device_node *np, *ep; - - ep =of_graph_get_endpoint_by_regs (dev->of_node,FIMD_PORT_RGB ,0 ); -if (!ep) -return NULL ; - - np =of_graph_get_remote_port_parent (ep); -of_node_put (ep); - -return np; -} -static int exynos_dpi_parse_dt (struct exynos_dpi *ctx) {struct device *dev = ctx->dev;struct device_node *dn = dev->of_node;struct device_node *np; - ctx->panel_node =exynos_dpi_of_find_panel_node (dev); + ctx->panel_node =of_graph_get_remote_node (dn,FIMD_PORT_RGB ,0 ); np =of_get_child_by_name (dn,"display-timings" );if (np) {
drivers/gpu/drm/exynos/exynos_drm_dsi.c +3 -10
@@ -1670,17 +1670,10 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)of_node_put (ep); - ep =of_graph_get_next_endpoint (node,NULL ); -if (!ep) { - ret = -EINVAL ; - goto end; - } + dsi->bridge_node =of_graph_get_remote_node (node,DSI_PORT_OUT ,0 ); +if (!dsi->bridge_node) +return -EINVAL ; - dsi->bridge_node =of_graph_get_remote_port_parent (ep); -if (!dsi->bridge_node) { - ret = -EINVAL ; - goto end; - } end:of_node_put (ep);
drivers/gpu/drm/exynos/exynos_drm_mic.c +2 -25
@@ -228,29 +228,6 @@ static void mic_set_reg_on(struct exynos_mic *mic, bool enable)writel (reg, mic->reg +MIC_OP ); } -static struct device_node *get_remote_node (struct device_node *from,int reg) -{ -struct device_node *endpoint =NULL , *remote_node =NULL ; - - endpoint =of_graph_get_endpoint_by_regs (from, reg,-1 ); -if (!endpoint) { -DRM_ERROR ("mic: Failed to find remote port from %s" , - from->full_name); - goto exit; - } - - remote_node =of_graph_get_remote_port_parent (endpoint); -if (!remote_node) { -DRM_ERROR ("mic: Failed to find remote port parent from %s" , - from->full_name); - goto exit; - } - -exit: -of_node_put (endpoint); -return remote_node; -} -static int parse_dt (struct exynos_mic *mic) {int ret =0 , i, j;
@@ -262,7 +239,7 @@ static int parse_dt(struct exynos_mic *mic)* The first node must be for decon and the second one must be for dsi. */ for (i =0 , j =0 ; i <NUM_ENDPOINTS ; i++) { - remote_node =get_remote_node (mic->dev->of_node, i); + remote_node =of_graph_get_remote_node (mic->dev->of_node, i,0 );if (!remote_node) { ret = -EPIPE ; goto exit;
@@ -279,7 +256,7 @@ static int parse_dt(struct exynos_mic *mic)break ;case ENDPOINT_DSI_NODE :/* panel node */ - remote_node =get_remote_node (remote_node,1 ); + remote_node =of_graph_get_remote_node (remote_node,1 ,0 );if (!remote_node) { ret = -EPIPE ; goto exit;
drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +4 -22
@@ -757,34 +757,16 @@ static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi) {struct dsi_hw_ctx *ctx = dsi->ctx;struct device_node *np = pdev->dev.of_node; -struct device_node *endpoint, *bridge_node; -struct drm_bridge *bridge; +struct device_node *bridge_node;struct resource *res;/* * Get the endpoint node. In our case, dsi has one output port1 * to which the external HDMI bridge is connected. */ - endpoint =of_graph_get_endpoint_by_regs (np,1 ,-1 ); -if (!endpoint) { -DRM_ERROR ("no valid endpoint node\n" ); -return -ENODEV ; - } -of_node_put (endpoint); - - bridge_node =of_graph_get_remote_port_parent (endpoint); -if (!bridge_node) { -DRM_ERROR ("no valid bridge node\n" ); -return -ENODEV ; - } -of_node_put (bridge_node); - - bridge =of_drm_find_bridge (bridge_node); -if (!bridge) { -DRM_INFO ("wait for external HDMI bridge driver.\n" ); -return -EPROBE_DEFER ; - } - dsi->bridge = bridge; + ret =drm_of_find_panel_or_bridge (np,NULL , &dsi->bridge); +if (ret) +return ret; ctx->pclk =devm_clk_get (&pdev->dev,"pclk" );if (IS_ERR (ctx->pclk)) {
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +1 -29
@@ -247,34 +247,6 @@ static const struct component_master_ops kirin_drm_ops = { .unbind = kirin_drm_unbind, }; -static struct device_node *kirin_get_remote_node (struct device_node *np) -{ -struct device_node *endpoint, *remote; - -/* get the first endpoint, in our case only one remote node -* is connected to display controller. -*/ - endpoint =of_graph_get_next_endpoint (np,NULL ); -if (!endpoint) { -DRM_ERROR ("no valid endpoint node\n" ); -return ERR_PTR (-ENODEV ); - } - - remote =of_graph_get_remote_port_parent (endpoint); -of_node_put (endpoint); -if (!remote) { -DRM_ERROR ("no valid remote node\n" ); -return ERR_PTR (-ENODEV ); - } - -if (!of_device_is_available (remote)) { -DRM_ERROR ("not available for remote node\n" ); -return ERR_PTR (-ENODEV ); - } - -return remote; -} -static int kirin_drm_platform_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -288,7 +260,7 @@ static int kirin_drm_platform_probe(struct platform_device *pdev)return -EINVAL ; } - remote =kirin_get_remote_node (np); + remote =of_graph_get_remote_node (np,0 ,0 );if (IS_ERR (remote))return PTR_ERR (remote);
drivers/gpu/drm/mediatek/mtk_dpi.c +3 -9
@@ -661,7 +661,7 @@ static int mtk_dpi_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct mtk_dpi *dpi;struct resource *mem; -struct device_node *ep, *bridge_node =NULL ; +struct device_node *bridge_node;int comp_id;int ret;
@@ -706,15 +706,9 @@ static int mtk_dpi_probe(struct platform_device *pdev)return -EINVAL ; } - ep =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (ep) { - bridge_node =of_graph_get_remote_port_parent (ep); -of_node_put (ep); - } -if (!bridge_node) { -dev_err (dev,"Failed to find bridge node\n" ); + bridge_node =of_graph_get_remote_node (dev->of_node,0 ,0 ); +if (!bridge_node)return -ENODEV ; - }dev_info (dev,"Found bridge node: %s\n" , bridge_node->full_name);
drivers/gpu/drm/mediatek/mtk_hdmi.c +3 -23
@@ -1433,7 +1433,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, {struct device *dev = &pdev->dev;struct device_node *np = dev->of_node; -struct device_node *cec_np, *port, *ep, *remote, *i2c_np; +struct device_node *cec_np, *remote, *i2c_np;struct platform_device *cec_pdev;struct regmap *regmap;struct resource *mem;
@@ -1485,29 +1485,9 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,if (IS_ERR (hdmi->regs))return PTR_ERR (hdmi->regs); - port =of_graph_get_port_by_id (np,1 ); -if (!port) { -dev_err (dev,"Missing output port node\n" ); + remote =of_graph_get_remote_node (np,1 ,0 ); +if (!remote)return -EINVAL ; - } - - ep =of_get_child_by_name (port,"endpoint" ); -if (!ep) { -dev_err (dev,"Missing endpoint node in port %s\n" , - port->full_name); -of_node_put (port); -return -EINVAL ; - } -of_node_put (port); - - remote =of_graph_get_remote_port_parent (ep); -if (!remote) { -dev_err (dev,"Missing connector/bridge node for endpoint %s\n" , - ep->full_name); -of_node_put (ep); -return -EINVAL ; - } -of_node_put (ep);if (!of_device_is_compatible (remote,"hdmi-connector" )) { hdmi->bridge.next =of_drm_find_bridge (remote);
drivers/gpu/drm/meson/meson_drv.c +6 -6
@@ -163,14 +163,14 @@ static struct drm_driver meson_driver = {static bool meson_vpu_has_available_connectors (struct device *dev) { -struct device_node *ep, *remote; +struct device_node *remote; +int i; -/* Parses each endpoint and check if remote exists */ -for_each_endpoint_of_node (dev->of_node, ep) { -/* If the endpoint node exists, consider it enabled */ - remote =of_graph_get_remote_port (ep); -if (remote) +for_each_of_graph_remote_node (dev->of_node, remote, i,2 ) { +if (remote) { +of_node_put (remote);return true; + } }return false;
drivers/gpu/drm/meson/meson_venc_cvbs.c +4 -15
@@ -217,25 +217,14 @@ static const struct drm_encoder_helper_funcsstatic bool meson_venc_cvbs_connector_is_available (struct meson_drm *priv) { -struct device_node *ep, *remote; +struct device_node *remote; -/* CVBS VDAC output is on the first port, first endpoint */ - ep =of_graph_get_endpoint_by_regs (priv->dev->of_node,0 ,0 ); -if (!ep) + remote =of_graph_get_remote_node (priv->dev->of_node,0 ,0 ); +if (!remote)return false; - -/* If the endpoint node exists, consider it enabled */ - remote =of_graph_get_remote_port (ep); -if (remote) { -of_node_put (ep); -return true; - } - -of_node_put (ep);of_node_put (remote); - -return false; +return true; }int meson_venc_cvbs_create (struct meson_drm *priv)
drivers/gpu/drm/msm/dsi/dsi_host.c +1 -2
@@ -1637,9 +1637,8 @@ static int dsi_host_parse_dt(struct msm_dsi_host *msm_host) }/* Get panel node from the output port's endpoint data */ - device_node =of_graph_get_remote_port_parent (endpoint); + device_node =of_graph_get_remote_node (np,1 ,0 );if (!device_node) { -dev_err (dev,"%s: no valid device\n" , __func__); ret = -ENODEV ; goto err; }
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +1 -27
@@ -225,32 +225,6 @@ int mdp4_enable(struct mdp4_kms *mdp4_kms)return 0 ; } -static struct device_node *mdp4_detect_lcdc_panel (struct drm_device *dev) -{ -struct device_node *endpoint, *panel_node; -struct device_node *np = dev->dev->of_node; - -/* -* LVDS/LCDC is the first port described in the list of ports in the -* MDP4 DT node. -*/ - endpoint =of_graph_get_endpoint_by_regs (np,0 ,-1 ); -if (!endpoint) { -DBG ("no LVDS remote endpoint\n" ); -return NULL ; - } - - panel_node =of_graph_get_remote_port_parent (endpoint); -if (!panel_node) { -DBG ("no valid panel node in LVDS endpoint\n" ); -of_node_put (endpoint); -return NULL ; - } - -of_node_put (endpoint); - -return panel_node; -}static int mdp4_modeset_init_intf (struct mdp4_kms *mdp4_kms,int intf_type)
@@ -270,7 +244,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,* bail out early if there is no panel node (no need to * initialize LCDC encoder and LVDS connector) */ - panel_node =mdp4_detect_lcdc_panel (dev); + panel_node =of_graph_get_remote_node (dev->dev->of_node,0 ,0 );if (!panel_node)return 0 ;
drivers/gpu/drm/rockchip/rockchip_drm_drv.c +6 -12
@@ -373,19 +373,13 @@ static void rockchip_add_endpoints(struct device *dev,struct component_match **match, struct device_node *port) { - struct device_node *ep, *remote; + struct device_node *remote; +int i; -for_each_child_of_node (port, ep) { - remote =of_graph_get_remote_port_parent (ep); -if (!remote || !of_device_is_available (remote)) { -of_node_put (remote); -continue ; - }else if (!of_device_is_available (remote->parent)) { -dev_warn (dev,"parent device of %s is not available\n" , - remote->full_name); -of_node_put (remote); +for (i =0 ; i <3 ; i++) { + remote =of_graph_get_remote_node (port,0 , i); +if (!remote)continue ; - }drm_of_component_match_add (dev, match, compare_of, remote);of_node_put (remote);
@@ -464,7 +458,7 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev)continue ; } -rockchip_add_endpoints (dev, &match, port); +rockchip_add_endpoints (dev, &match, port->parent);of_node_put (port); }
drivers/gpu/drm/tilcdc/tilcdc_crtc.c +1 -10
@@ -1013,16 +1013,7 @@ int tilcdc_crtc_create(struct drm_device *dev)drm_crtc_helper_add (crtc, &tilcdc_crtc_helper_funcs);if (priv->is_componentized) { -struct device_node *ports = -of_get_child_by_name (dev->dev->of_node,"ports" ); - -if (ports) { - crtc->port =of_get_child_by_name (ports,"port" ); -of_node_put (ports); - }else { - crtc->port = -of_get_child_by_name (dev->dev->of_node,"port" ); - } + crtc->port =of_graph_get_port_by_id (dev->dev->of_node,0 ,0 );if (!crtc->port) {/* This should never happen */ dev_err (dev->dev,"Port node not found in %s\n" , dev->dev->of_node->full_name);
drivers/gpu/drm/tilcdc/tilcdc_external.c +8 -58
89 lines not on this page · raw message
drivers/gpu/drm/vc4/vc4_dpi.c +3 -12
@@ -366,23 +366,14 @@ static const struct of_device_id vc4_dpi_dt_match[] = {*/ static struct drm_panel *vc4_dpi_get_panel (struct device *dev) { -struct device_node *endpoint, *panel_node; +struct device_node *panel_node;struct device_node *np = dev->of_node;struct drm_panel *panel; - endpoint =of_graph_get_next_endpoint (np,NULL ); -if (!endpoint) { -dev_err (dev,"no endpoint to fetch DPI panel\n" ); -return NULL ; - } -/* don't proceed if we have an endpoint but no panel_node tied to it */ - panel_node =of_graph_get_remote_port_parent (endpoint); -of_node_put (endpoint); -if (!panel_node) { -dev_err (dev,"no valid panel node\n" ); + panel_node =of_graph_get_remote_node (np,0 ,0 ); +if (!panel_node)return NULL ; - } panel =of_drm_find_panel (panel_node);of_node_put (panel_node);
Signature · 1 line
2.10.1
Rob Herring
maintainerPATCH 4/5 drm: convert drivers to use drm_of_find_panel_or_bridge
In reply to Rob HerringSimilar to the previous commit, convert drivers open coding OF graph parsing to use drm_of_find_panel_or_bridge instead.
This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 64 ++++------------- drivers/gpu/drm/bridge/nxp-ptn3460.c | 16 ++--- drivers/gpu/drm/bridge/parade-ps8622.c | 16 ++--- drivers/gpu/drm/bridge/tc358767.c | 27 +------ drivers/gpu/drm/exynos/exynos_dp.c | 35 ++++----- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 49 ++++--------- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 5 +- drivers/gpu/drm/imx/imx-ldb.c | 28 ++------ drivers/gpu/drm/imx/parallel-display.c | 35 ++------- drivers/gpu/drm/mediatek/mtk_dsi.c | 23 ++---- drivers/gpu/drm/mxsfb/mxsfb_out.c | 36 ++-------- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 26 ++----- drivers/gpu/drm/sun4i/sun4i_rgb.c | 17 ++--- drivers/gpu/drm/sun4i/sun4i_tcon.c | 90 ++---------------------- 14 files changed, 88 insertions(+), 379 deletions(-)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c +12 -52
@@ -22,7 +22,7 @@#include <linux/of_graph.h> #include <drm/drmP.h> -#include <drm/drm_panel.h> +#include <drm/drm_of.h> #include "atmel_hlcdc_dc.h"
@@ -152,29 +152,11 @@ static const struct drm_connector_funcs atmel_hlcdc_panel_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; -static int atmel_hlcdc_check_endpoint (struct drm_device *dev, -const struct of_endpoint *ep) -{ -struct device_node *np; -void *obj; - - np =of_graph_get_remote_port_parent (ep->local_node); - - obj =of_drm_find_panel (np); -if (!obj) - obj =of_drm_find_bridge (np); - -of_node_put (np); - -return obj ?0 : -EPROBE_DEFER ; -} -static int atmel_hlcdc_attach_endpoint (struct drm_device *dev, -const struct of_endpoint *ep) +const struct device_node *np) {struct atmel_hlcdc_dc *dc = dev->dev_private;struct atmel_hlcdc_rgb_output *output; -struct device_node *np;struct drm_panel *panel;struct drm_bridge *bridge;int ret;
@@ -195,13 +177,11 @@ static int atmel_hlcdc_attach_endpoint(struct drm_device *dev, output->encoder.possible_crtcs =0x1 ; - np =of_graph_get_remote_port_parent (ep->local_node); - - ret = -EPROBE_DEFER ; + ret =drm_of_find_panel_or_bridge (np,0 ,0 , &panel, &bridge); +if (ret) +return ret; - panel =of_drm_find_panel (np);if (panel) { -of_node_put (np); output->connector.dpms =DRM_MODE_DPMS_OFF ; output->connector.polled =DRM_CONNECTOR_POLL_CONNECT ; drm_connector_helper_add(&output->connector,
@@ -226,9 +206,6 @@ static int atmel_hlcdc_attach_endpoint(struct drm_device *dev,return 0 ; } - bridge =of_drm_find_bridge (np); -of_node_put (np); -if (bridge) { output->encoder.bridge = bridge; bridge->encoder = &output->encoder;
@@ -245,31 +222,14 @@ static int atmel_hlcdc_attach_endpoint(struct drm_device *dev,int atmel_hlcdc_create_outputs (struct drm_device *dev) { -struct device_node *ep_np =NULL ; -struct of_endpoint ep; +struct device_node *remote;int ret; -for_each_endpoint_of_node (dev->dev->of_node, ep_np) { - ret =of_graph_parse_endpoint (ep_np, &ep); -if (!ret) - ret =atmel_hlcdc_check_endpoint (dev, &ep); - -if (ret) { -of_node_put (ep_np); -return ret; - } - } - -for_each_endpoint_of_node (dev->dev->of_node, ep_np) { - ret =of_graph_parse_endpoint (ep_np, &ep); -if (!ret) - ret =atmel_hlcdc_attach_endpoint (dev, &ep); - -if (ret) { -of_node_put (ep_np); -return ret; - } - } + remote =of_graph_get_remote_node (dev->dev->of_node,0 ,0 ); +if (!remote) +return -ENODEV ; -return 0 ; + ret =atmel_hlcdc_attach_endpoint (dev, remote); +of_node_put (remote); +return ret; }
drivers/gpu/drm/bridge/nxp-ptn3460.c +4 -12
@@ -20,8 +20,8 @@#include <linux/module.h> #include <linux/of.h> #include <linux/of_gpio.h> -#include <linux/of_graph.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include "drm_crtc.h"
@@ -292,7 +292,6 @@ static int ptn3460_probe(struct i2c_client *client, {struct device *dev = &client->dev;struct ptn3460_bridge *ptn_bridge; -struct device_node *endpoint, *panel_node;int ret; ptn_bridge =devm_kzalloc (dev,sizeof (*ptn_bridge),GFP_KERNEL );
@@ -300,16 +299,9 @@ static int ptn3460_probe(struct i2c_client *client,return -ENOMEM ; } - endpoint =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (endpoint) { - panel_node =of_graph_get_remote_port_parent (endpoint); -if (panel_node) { - ptn_bridge->panel =of_drm_find_panel (panel_node); -of_node_put (panel_node); -if (!ptn_bridge->panel) -return -EPROBE_DEFER ; - } - } + ret =drm_of_find_panel_or_bridge (dev->of_node,0 ,0 , &ptn_bridge->panel,NULL ); +if (ret) +return ret; ptn_bridge->client = client;
drivers/gpu/drm/bridge/parade-ps8622.c +4 -12
@@ -22,10 +22,10 @@#include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> -#include <linux/of_graph.h> #include <linux/pm.h> #include <linux/regulator/consumer.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include "drmP.h"
@@ -536,7 +536,6 @@ static int ps8622_probe(struct i2c_client *client, const struct i2c_device_id *id) {struct device *dev = &client->dev; -struct device_node *endpoint, *panel_node;struct ps8622_bridge *ps8622;int ret;
@@ -544,16 +543,9 @@ static int ps8622_probe(struct i2c_client *client,if (!ps8622)return -ENOMEM ; - endpoint =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (endpoint) { - panel_node =of_graph_get_remote_port_parent (endpoint); -if (panel_node) { - ps8622->panel =of_drm_find_panel (panel_node); -of_node_put (panel_node); -if (!ps8622->panel) -return -EPROBE_DEFER ; - } - } + ret =drm_of_find_panel_or_bridge (dev->of_node,0 ,0 , &ps8622->panel,NULL ); +if (ret) +return ret; ps8622->client = client;
drivers/gpu/drm/bridge/tc358767.c +3 -24
@@ -1244,7 +1244,6 @@ static const struct regmap_config tc_regmap_config = {static int tc_probe (struct i2c_client *client,const struct i2c_device_id *id) {struct device *dev = &client->dev; -struct device_node *ep;struct tc_data *tc;int ret;
@@ -1255,29 +1254,9 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) tc->dev = dev;/* port@2 is the output port */ - ep =of_graph_get_endpoint_by_regs (dev->of_node,2 ,-1 ); -if (ep) { -struct device_node *remote; - - remote =of_graph_get_remote_port_parent (ep); -if (!remote) { -dev_warn (dev,"endpoint %s not connected\n" , - ep->full_name); -of_node_put (ep); -return -ENODEV ; - } -of_node_put (ep); - tc->panel =of_drm_find_panel (remote); -if (tc->panel) { -dev_dbg (dev,"found panel %s\n" , remote->full_name); - }else { -dev_dbg (dev,"waiting for panel %s\n" , - remote->full_name); -of_node_put (remote); -return -EPROBE_DEFER ; - } -of_node_put (remote); - } + ret =drm_of_find_panel_or_bridge (dev->of_node,2 ,0 , &tc->panel,NULL ); +if (ret) +return ret;/* Shut down GPIO is optional */ tc->sd_gpio =devm_gpiod_get_optional (dev,"shutdown" ,GPIOD_OUT_HIGH );
drivers/gpu/drm/exynos/exynos_dp.c +12 -23
@@ -23,6 +23,7 @@#include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/bridge/analogix_dp.h>
@@ -215,8 +216,11 @@ static const struct component_ops exynos_dp_ops = {static int exynos_dp_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev; -struct device_node *np =NULL , *endpoint =NULL ; +struct device_node *np;struct exynos_dp_device *dp; +struct drm_panel *panel; +struct drm_bridge *bridge; +int ret; dp =devm_kzalloc (&pdev->dev,sizeof (struct exynos_dp_device ),GFP_KERNEL );
@@ -240,28 +244,13 @@ static int exynos_dp_probe(struct platform_device *pdev) goto out; } - endpoint =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (endpoint) { - np =of_graph_get_remote_port_parent (endpoint); -if (np) { -/* The remote port can be either a panel or a bridge */ - dp->plat_data.panel =of_drm_find_panel (np); -if (!dp->plat_data.panel) { - dp->ptn_bridge =of_drm_find_bridge (np); -if (!dp->ptn_bridge) { -of_node_put (np); -return -EPROBE_DEFER ; - } - } -of_node_put (np); - }else { -DRM_ERROR ("no remote endpoint device node found.\n" ); -return -EINVAL ; - } - }else { -DRM_ERROR ("no port endpoint subnode found.\n" ); -return -EINVAL ; - } + ret =drm_of_find_panel_or_bridge (dev->of_node,0 ,0 , &panel, &bridge); +if (ret) +return ret; + +/* The remote port can be either a panel or a bridge */ + dp->plat_data.panel = panel; + dp->ptn_bridge = bridge; out:return component_add (&pdev->dev, &exynos_dp_ops);
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c +14 -35
69 lines not on this page · raw message
drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +2 -3
@@ -17,7 +17,6 @@#include <linux/clk.h> #include <linux/component.h> -#include <linux/of_graph.h> #include <drm/drm_of.h> #include <drm/drm_crtc_helper.h>
@@ -757,14 +756,14 @@ static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi) {struct dsi_hw_ctx *ctx = dsi->ctx;struct device_node *np = pdev->dev.of_node; -struct device_node *bridge_node;struct resource *res; +int ret;/* * Get the endpoint node. In our case, dsi has one output port1 * to which the external HDMI bridge is connected. */ - ret =drm_of_find_panel_or_bridge (np,NULL , &dsi->bridge); + ret =drm_of_find_panel_or_bridge (np,0 ,0 ,NULL , &dsi->bridge);if (ret)return ret;
drivers/gpu/drm/imx/imx-ldb.c +6 -22
@@ -649,7 +649,7 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)for_each_child_of_node (np, child) {struct imx_ldb_channel *channel; -struct device_node *ep; +struct device_node *remote;int bus_format; ret =of_property_read_u32 (child,"reg" , &i);
@@ -673,27 +673,11 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)* The output port is port@4 with an external 4-port mux or * port@2 with the internal 2-port mux. */ - ep =of_graph_get_endpoint_by_regs (child, - imx_ldb->lvds_mux ?4 :2 , --1 ); -if (ep) { -struct device_node *remote; - - remote =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (remote) { - channel->panel =of_drm_find_panel (remote); - channel->bridge =of_drm_find_bridge (remote); - }else -return -EPROBE_DEFER ; -of_node_put (remote); - -if (!channel->panel && !channel->bridge) { -dev_err (dev,"panel/bridge not found: %s\n" , - remote->full_name); -return -EPROBE_DEFER ; - } - } + ret =drm_of_find_panel_or_bridge (fsl_dev->np, + imx_ldb->lvds_mux ?4 :2 ,0 , + &channel->panel, &channel->bridge); +if (ret) +return ret;/* panel ddc only if there is no bridge */ if (!channel->bridge) {
drivers/gpu/drm/imx/parallel-display.c +4 -31
@@ -210,7 +210,7 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) {struct drm_device *drm = data;struct device_node *np = dev->of_node; -struct device_node *ep; +struct device_node *remote;const u8 *edidp;struct imx_parallel_display *imxpd;int ret;
@@ -239,36 +239,9 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) imxpd->bus_format = bus_format;/* port@1 is the output port */ - ep =of_graph_get_endpoint_by_regs (np,1 ,-1 ); -if (ep) { -struct device_node *remote; - - remote =of_graph_get_remote_port_parent (ep); -if (!remote) { -dev_warn (dev,"endpoint %s not connected\n" , - ep->full_name); -of_node_put (ep); -return -ENODEV ; - } -of_node_put (ep); - - imxpd->panel =of_drm_find_panel (remote); -if (imxpd->panel) { -dev_dbg (dev,"found panel %s\n" , remote->full_name); - }else { - imxpd->bridge =of_drm_find_bridge (remote); -if (imxpd->bridge) -dev_dbg (dev,"found bridge %s\n" , - remote->full_name); - } -if (!imxpd->panel && !imxpd->bridge) { -dev_dbg (dev,"waiting for panel or bridge %s\n" , - remote->full_name); -of_node_put (remote); -return -EPROBE_DEFER ; - } -of_node_put (remote); - } + ret =drm_of_find_panel_or_bridge (np,1 ,0 , &imxpd->panel, &imxpd->bridge); +if (ret) +return ret; imxpd->dev = dev;
drivers/gpu/drm/mediatek/mtk_dsi.c +5 -18
@@ -16,11 +16,11 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_panel.h> +#include <drm/drm_of.h> #include <linux/clk.h> #include <linux/component.h> #include <linux/of.h> #include <linux/of_platform.h> -#include <linux/of_graph.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> #include <video/videomode.h>
@@ -819,7 +819,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) {struct mtk_dsi *dsi;struct device *dev = &pdev->dev; -struct device_node *remote_node, *endpoint;struct resource *regs;int comp_id;int ret;
@@ -831,22 +830,10 @@ static int mtk_dsi_probe(struct platform_device *pdev) dsi->host.ops = &mtk_dsi_ops; dsi->host.dev = dev; - endpoint =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (endpoint) { - remote_node =of_graph_get_remote_port_parent (endpoint); -if (!remote_node) { -dev_err (dev,"No panel connected\n" ); -return -ENODEV ; - } - - dsi->bridge =of_drm_find_bridge (remote_node); - dsi->panel =of_drm_find_panel (remote_node); -of_node_put (remote_node); -if (!dsi->bridge && !dsi->panel) { -dev_info (dev,"Waiting for bridge or panel driver\n" ); -return -EPROBE_DEFER ; - } - } + ret =drm_of_find_panel_or_bridge (dev->of_node,0 ,0 , + &dsi->panel, &dsi->bridge); +if (ret) +return ret; dsi->engine_clk =devm_clk_get (dev,"engine" );if (IS_ERR (dsi->engine_clk)) {
drivers/gpu/drm/mxsfb/mxsfb_out.c +6 -30
@@ -19,6 +19,7 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_plane_helper.h> #include <drm/drm_simple_kms_helper.h>
@@ -82,20 +83,15 @@ static const struct drm_connector_funcs mxsfb_panel_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; -static int mxsfb_attach_endpoint (struct drm_device *drm, -const struct of_endpoint *ep) +int mxsfb_create_output (struct drm_device *drm) {struct mxsfb_drm_private *mxsfb = drm->dev_private; -struct device_node *np;struct drm_panel *panel; -int ret = -EPROBE_DEFER ; - - np =of_graph_get_remote_port_parent (ep->local_node); - panel =of_drm_find_panel (np); -of_node_put (np); +int ret; -if (!panel) -return -EPROBE_DEFER ; + ret =drm_of_find_panel_or_bridge (drm->dev->of_node,0 ,0 , &panel,NULL ); +if (ret) +return ret; mxsfb->connector.dpms =DRM_MODE_DPMS_OFF ; mxsfb->connector.polled =0 ;
@@ -109,23 +105,3 @@ static int mxsfb_attach_endpoint(struct drm_device *drm,return ret; } - -int mxsfb_create_output (struct drm_device *drm) -{ -struct device_node *ep_np =NULL ; -struct of_endpoint ep; -int ret; - -for_each_endpoint_of_node (drm->dev->of_node, ep_np) { - ret =of_graph_parse_endpoint (ep_np, &ep); -if (!ret) - ret =mxsfb_attach_endpoint (drm, &ep); - -if (ret) { -of_node_put (ep_np); -return ret; - } - } - -return 0 ; -}
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +4 -22
@@ -428,31 +428,13 @@ static const struct component_ops rockchip_dp_component_ops = {static int rockchip_dp_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev; -struct device_node *panel_node, *port, *endpoint;struct drm_panel *panel =NULL ;struct rockchip_dp_device *dp; +int ret; - port =of_graph_get_port_by_id (dev->of_node,1 ); -if (port) { - endpoint =of_get_child_by_name (port,"endpoint" ); -of_node_put (port); -if (!endpoint) { -dev_err (dev,"no output endpoint found\n" ); -return -EINVAL ; - } - - panel_node =of_graph_get_remote_port_parent (endpoint); -of_node_put (endpoint); -if (!panel_node) { -dev_err (dev,"no output node found\n" ); -return -EINVAL ; - } - - panel =of_drm_find_panel (panel_node); -of_node_put (panel_node); -if (!panel) -return -EPROBE_DEFER ; - } + ret =drm_of_find_panel_or_bridge (dev->of_node,1 ,0 , &panel,NULL ); +if (ret) +return ret; dp =devm_kzalloc (dev,sizeof (*dp),GFP_KERNEL );if (!dp)
drivers/gpu/drm/sun4i/sun4i_rgb.c +7 -10
@@ -15,6 +15,7 @@#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include "sun4i_drv.h"
@@ -217,12 +218,10 @@ int sun4i_rgb_init(struct drm_device *drm) rgb->drv = drv; encoder = &rgb->encoder; - tcon->panel =sun4i_tcon_find_panel (tcon->dev->of_node); - encoder->bridge =sun4i_tcon_find_bridge (tcon->dev->of_node); -if (IS_ERR (tcon->panel) &&IS_ERR (encoder->bridge)) { -dev_info (drm->dev,"No panel or bridge found... RGB output disabled\n" ); -return 0 ; - } + ret =drm_of_find_panel_or_bridge (tcon->dev->of_node,1 ,0 , + &tcon->panel, &encoder->bridge); +if (ret) +return ret;drm_encoder_helper_add (&rgb->encoder, &sun4i_rgb_enc_helper_funcs);
@@ -239,7 +238,7 @@ int sun4i_rgb_init(struct drm_device *drm)/* The RGB encoder can only work with the TCON channel 0 */ rgb->encoder.possible_crtcs =BIT (0 ); -if (!IS_ERR (tcon->panel)) { +if (tcon->panel) {drm_connector_helper_add (&rgb->connector, &sun4i_rgb_con_helper_funcs); ret = drm_connector_init(drm, &rgb->connector,
@@ -260,7 +259,7 @@ int sun4i_rgb_init(struct drm_device *drm) } } -if (!IS_ERR (encoder->bridge)) { +if (encoder->bridge) { encoder->bridge->encoder = &rgb->encoder; ret =drm_bridge_attach (drm, encoder->bridge);
@@ -268,8 +267,6 @@ int sun4i_rgb_init(struct drm_device *drm)dev_err (drm->dev,"Couldn't attach our bridge\n" ); goto err_cleanup_connector; } - }else { - encoder->bridge =NULL ; }return 0 ;
drivers/gpu/drm/sun4i/sun4i_tcon.c +5 -85
114 lines not on this page · raw message
Signature · 1 line
2.10.1
Rob Herring
maintainerPATCH 5/5 drm: omap: use common OF graph helpers
In reply to Rob HerringThe OMAP driver has its own OF graph helpers that are similar to the common helpers. This commit replaces most of the calls with the common helpers. There's still a couple of custom helpers left, but the driver needs more extensive changes to get rid of them.
In dss_init_ports, we invert the loop, looping through the known ports and matching them to DT nodes rather than looping thru DT nodes and matching them to the ports.
--- drivers/gpu/drm/omapdrm/dss/dpi.c | 2 +- drivers/gpu/drm/omapdrm/dss/dsi.c | 2 +- drivers/gpu/drm/omapdrm/dss/dss-of.c | 102 +--------------------------------- drivers/gpu/drm/omapdrm/dss/dss.c | 61 +++++--------------- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 3 +- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- drivers/gpu/drm/omapdrm/dss/omapdss.h | 11 ---- drivers/gpu/drm/omapdrm/dss/venc.c | 3 +- 8 files changed, 23 insertions(+), 163 deletions(-)
drivers/gpu/drm/omapdrm/dss/dpi.c +1 -1
@@ -855,7 +855,7 @@ int dpi_init_port(struct platform_device *pdev, struct device_node *port)if (!dpi)return -ENOMEM ; - ep =omapdss_of_get_next_endpoint (port,NULL ); + ep =of_get_next_child (port,NULL );if (!ep)return 0 ;
drivers/gpu/drm/omapdrm/dss/dsi.c +1 -1
@@ -5091,7 +5091,7 @@ static int dsi_probe_of(struct platform_device *pdev)struct device_node *ep;struct omap_dsi_pin_config pin_cfg; - ep =omapdss_of_get_first_endpoint (node); + ep =of_graph_get_endpoint_by_regs (node,0 ,0 );if (!ep)return 0 ;
drivers/gpu/drm/omapdrm/dss/dss-of.c +3 -99
128 lines not on this page · raw message
drivers/gpu/drm/omapdrm/dss/dss.c +13 -48
97 lines not on this page · raw message
drivers/gpu/drm/omapdrm/dss/hdmi4.c +2 -1
@@ -34,6 +34,7 @@#include <linux/regulator/consumer.h> #include <linux/component.h> #include <linux/of.h> +#include <linux/of_graph.h> #include <sound/omap-hdmi-audio.h> #include "omapdss.h"
@@ -546,7 +547,7 @@ static int hdmi_probe_of(struct platform_device *pdev)struct device_node *ep;int r; - ep =omapdss_of_get_first_endpoint (node); + ep =of_graph_get_endpoint_by_regs (node,0 ,0 );if (!ep)return 0 ;
drivers/gpu/drm/omapdrm/dss/hdmi5.c +1 -1
@@ -572,7 +572,7 @@ static int hdmi_probe_of(struct platform_device *pdev)struct device_node *ep;int r; - ep =omapdss_of_get_first_endpoint (node); + ep =of_graph_get_endpoint_by_regs (node,0 ,0 );if (!ep)return 0 ;
drivers/gpu/drm/omapdrm/dss/omapdss.h +0 -11
@@ -830,17 +830,6 @@ static inline bool omapdss_device_is_enabled(struct omap_dss_device *dssdev)return dssdev->state ==OMAP_DSS_DISPLAY_ACTIVE ; } -struct device_node * -omapdss_of_get_next_port (const struct device_node *parent, -struct device_node *prev); - -struct device_node * -omapdss_of_get_next_endpoint (const struct device_node *parent, -struct device_node *prev); - -struct device_node * -omapdss_of_get_first_endpoint (const struct device_node *parent); -struct omap_dss_device *omapdss_of_find_source_for_first_ep (struct device_node *node);
drivers/gpu/drm/omapdrm/dss/venc.c +2 -1
@@ -35,6 +35,7 @@#include <linux/regulator/consumer.h> #include <linux/pm_runtime.h> #include <linux/of.h> +#include <linux/of_graph.h> #include <linux/component.h> #include "omapdss.h"
@@ -818,7 +819,7 @@ static int venc_probe_of(struct platform_device *pdev)u32 channels;int r; - ep =omapdss_of_get_first_endpoint (node); + ep =of_graph_get_endpoint_by_regs (node,0 ,0 );if (!ep)return 0 ;
Signature · 1 line
2.10.1
Quoted 3 lines · Rob Herring
The Armada and Rockchip drivers remain oddballs with their own graph parsing. I can't see how the armada driver even can work. There's nothing to instantiate the armada-drm device either in DT or the kernel.
Correct, that's sitting out of tree because it requires either legacy code in arch/arm/mach-dove at the moment, or stuff for DT. Each time that I looked at the DT reserved memory stuff I've ended up giving up as it always seemed to be half complete, and the documentation was confusing (seemingly referring to things that weren't merged.)
Maybe that's changed today, but I've not had a chance to look at it again.
Signature · 3 lines
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.
Re: [PATCH 1/5] of: introduce of_graph_get_remote_node
In reply to Rob HerringHi Rob,
Quoted 17 lines · Rob Herring
The OF graph API leaves too much of the graph walking to clients when in many cases the driver doesn't care about accessing the port or endpoint nodes. The drivers typically just want the device connected via a particular graph connection.
of_graph_get_remote_nodeprovides this functionality.Signed-off-by Rob Herring <[email protected]>--- drivers/of/base.c | 28 ++++++++++++++++++++++++++++ include/linux/of_graph.h | 8 ++++++++ 2 files changed, 36 insertions(+)drivers/of/base.c +0
-0
drivers/of/base.c struct device_node *of_graph_get_remote_port(const struct device_node *node) · line 2474
Quoted 6 lines
drivers/of/base.c +3
-0@@ -2469,3 +2469,31 @@ struct device_node *of_graph_get_remote_port(const struct device_node *node)return of_get_next_parent (np); }EXPORT_SYMBOL (of_graph_get_remote_port); + +struct device_node *of_graph_get_remote_node (const struct device_node *node, +int port,int endpoint)
it would be nice to add a short comment that a returned device node is expected to be dereferenced with of_node_put().
drivers/of/base.c struct device_node *of_graph_get_remote_port(const struct device_node *node) · line 2486
Quoted 12 lines
drivers/of/base.c +12
-0+{ +struct device_node *endpoint_node, *remote; + + endpoint_node =of_graph_get_endpoint_by_regs (node, port, endpoint); +if (!endpoint_node) { +pr_debug ("no valid endpoint (%d, %d) for node %s\n" , + port, endpoint, node->full_name); +return NULL ; + } + + remote =of_graph_get_remote_port_parent (endpoint_node); +of_node_put (endpoint);
Typo, here it should be of_node_put(endpoint_node);
drivers/of/base.c struct device_node *of_graph_get_remote_port(const struct device_node *node) · line 2499
Quoted 13 lines
drivers/of/base.c +13
-0+if (!remote) { +pr_debug ("no valid remote node\n" ); +return NULL ; + } + +if (!of_device_is_available (remote)) { +pr_debug ("not available for remote node\n" ); +return NULL ; + } + +return remote; +} +EXPORT_SYMBOL (of_graph_get_remote_node);
--
With best wishes,
Vladimir
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Fabio Estevam
reviewerRe: [PATCH 4/5] drm: convert drivers to use drm_of_find_panel_or_bridge
In reply to Rob HerringHi Rob,
Quoted 25 lines · Rob Herring
drivers/gpu/drm/mxsfb/mxsfb_out.c +2
-5@@ -19,6 +19,7 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_plane_helper.h> #include <drm/drm_simple_kms_helper.h> @@ -82,20 +83,15 @@ static const struct drm_connector_funcs mxsfb_panel_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; -static int mxsfb_attach_endpoint (struct drm_device *drm, -const struct of_endpoint *ep) +int mxsfb_create_output (struct drm_device *drm) {struct mxsfb_drm_private *mxsfb = drm->dev_private; -struct device_node *np;struct drm_panel *panel; -int ret = -EPROBE_DEFER ; -
drivers/gpu/drm/mxsfb/mxsfb_out.c static const struct drm_connector_funcs mxsfb_panel_connector_funcs = { · line 94
Quoted 10 lines
drivers/gpu/drm/mxsfb/mxsfb_out.c +4
-5- np =of_graph_get_remote_port_parent (ep->local_node); - panel =of_drm_find_panel (np); -of_node_put (np); +int ret; -if (!panel) -return -EPROBE_DEFER ; + ret =drm_of_find_panel_or_bridge (drm->dev->of_node,0 ,0 , &panel,NULL ); +if (ret) +return ret;
I fixed some build issues of this series and I am trying to use it with the mxsfb drm driver.
I would like to add bridge support for this driver, so that I can use the TDA19988 HDMI bridge on a imx6sx-udoo-neo-full board.
My dts looks like this:
arch/arm/boot/dts/imx6sx-udoo-neo.dtsi +34 -0
@@ -185,6 +185,41 @@ }; }; +&i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + clock-frequency = <100000>; + status = "okay"; + + hdmi-transmitter@70 { + compatible = "nxp,tda998x"; + reg = <0x70>; + pinctrl-0 = <&pinctrl_hdmi>; + pinctrl-names = "default"; + interrupt-parent = <&gpio3>; + interrupts = <27 IRQ_TYPE_EDGE_FALLING>; + clocks = <&clks IMX6SX_CLK_CKO2>; + + port { + tda998x_input: endpoint { + remote-endpoint = <&lcdif1_output>; + }; + }; + }; +}; + +&lcdif1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd>; + status = "okay"; + + port { + lcdif1_output: endpoint { + remote-endpoint = <&tda998x_input>; + }; + }; +};
and I changed it to:
ret = drm_of_find_panel_or_bridge(drm->dev->of_node, 0, 0, &panel, &bridge);
,but drm_of_find_panel_or_bridge() always returns -EPROBE_DEFER.
Shouldn't it be able to find the bridge chip in this case? Any ideas of what it is missing?
Thanks
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Rob Herring
maintainerRe: [PATCH 4/5] drm: convert drivers to use drm_of_find_panel_or_bridge
Quoted 91 lines · Fabio Estevam
Hi Rob,
Quoted 25 lines · Rob Herring
drivers/gpu/drm/mxsfb/mxsfb_out.c +2
-5@@ -19,6 +19,7 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_plane_helper.h> #include <drm/drm_simple_kms_helper.h> @@ -82,20 +83,15 @@ static const struct drm_connector_funcs mxsfb_panel_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; -static int mxsfb_attach_endpoint (struct drm_device *drm, -const struct of_endpoint *ep) +int mxsfb_create_output (struct drm_device *drm) {struct mxsfb_drm_private *mxsfb = drm->dev_private; -struct device_node *np;struct drm_panel *panel; -int ret = -EPROBE_DEFER ; -drivers/gpu/drm/mxsfb/mxsfb_out.c static const struct drm_connector_funcs mxsfb_panel_connector_funcs = { · line 94
Quoted 10 lines
drivers/gpu/drm/mxsfb/mxsfb_out.c +4
-5- np =of_graph_get_remote_port_parent (ep->local_node); - panel =of_drm_find_panel (np); -of_node_put (np); +int ret; -if (!panel) -return -EPROBE_DEFER ; + ret =drm_of_find_panel_or_bridge (drm->dev->of_node,0 ,0 , &panel,NULL ); +if (ret) +return ret;I fixed some build issues of this series and I am trying to use it with the mxsfb drm driver.
I would like to add bridge support for this driver, so that I can use the TDA19988 HDMI bridge on a imx6sx-udoo-neo-full board.
My dts looks like this:
arch/arm/boot/dts/imx6sx-udoo-neo.dtsi +34
-0@@ -185,6 +185,41 @@ }; }; +&i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + clock-frequency = <100000>; + status = "okay"; + + hdmi-transmitter@70 { + compatible = "nxp,tda998x"; + reg = <0x70>; + pinctrl-0 = <&pinctrl_hdmi>; + pinctrl-names = "default"; + interrupt-parent = <&gpio3>; + interrupts = <27 IRQ_TYPE_EDGE_FALLING>; + clocks = <&clks IMX6SX_CLK_CKO2>; + + port { + tda998x_input: endpoint { + remote-endpoint = <&lcdif1_output>; + }; + }; + }; +}; + +&lcdif1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd>; + status = "okay"; + + port { + lcdif1_output: endpoint { + remote-endpoint = <&tda998x_input>; + }; + }; +};and I changed it to:
Quoted 6 lines
ret =
drm_of_find_panel_or_bridge(drm->dev->of_node, 0, 0, &panel, &bridge);,but
drm_of_find_panel_or_bridge()always returns -EPROBE_DEFER.Shouldn't it be able to find the bridge chip in this case? Any ideas of what it is missing?
Did the bridge driver probe? This function just checks lists of registered panels and bridges.
Rob
Fabio Estevam
reviewerRe: [PATCH 4/5] drm: convert drivers to use drm_of_find_panel_or_bridge
Quoted 2 lines · Rob Herring
Did the bridge driver probe? This function just checks lists of registered panels and bridges.
The tda998x_probe() returns success, but tda998x_bind() is never called.
I am trying to understand what needs to be done in drivers/gpu/drm/mxsfb/ so that it can bind the tda998x driver.
Thanks
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Fabio Estevam
reviewerRe: [PATCH 4/5] drm: convert drivers to use drm_of_find_panel_or_bridge
Quoted 5 lines · Fabio Estevam
The
tda998x_probe()returns success, buttda998x_bind()is never called.I am trying to understand what needs to be done in
drivers/gpu/drm/mxsfb/so that it can bind the tda998x driver.
Looks like that converting to component style and adding component_bind_all() does the trick:
[ 1.323772] tda998x 2-0070: found TDA19988 [ 1.342381] mxsfb 2220000.lcdif: bound 2-0070 (ops tda998x_ops)
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
In reply to Rob HerringThanks Rob, for nice cleanup, but ...
Quoted 78 lines · Rob Herring
drivers/gpu/drm/tilcdc/tilcdc_crtc.c +1
-10@@ -1013,16 +1013,7 @@ int tilcdc_crtc_create(struct drm_device *dev)drm_crtc_helper_add (crtc, &tilcdc_crtc_helper_funcs);if (priv->is_componentized) { -struct device_node *ports = -of_get_child_by_name (dev->dev->of_node,"ports" ); - -if (ports) { - crtc->port =of_get_child_by_name (ports,"port" ); -of_node_put (ports); - }else { - crtc->port = -of_get_child_by_name (dev->dev->of_node,"port" ); - } + crtc->port =of_graph_get_port_by_id (dev->dev->of_node,0 ,0 );if (!crtc->port) {/* This should never happen */ dev_err (dev->dev,"Port node not found in %s\n" , dev->dev->of_node->full_name);drivers/gpu/drm/tilcdc/tilcdc_external.c +1
-34@@ -187,39 +187,6 @@ int tilcdc_attach_bridge(struct drm_device *ddev, struct drm_bridge *bridge)return ret; } -static int tilcdc_node_has_port (struct device_node *dev_node) -{ -struct device_node *node; - - node =of_get_child_by_name (dev_node,"ports" ); -if (!node) - node =of_get_child_by_name (dev_node,"port" ); -if (!node) -return 0 ; -of_node_put (node); - -return 1 ; -} - -static -struct device_node *tilcdc_get_remote_node (struct device_node *node) -{ -struct device_node *ep; -struct device_node *parent; - -if (!tilcdc_node_has_port (node)) -return NULL ; - - ep =of_graph_get_next_endpoint (node,NULL ); -if (!ep) -return NULL ; - - parent =of_graph_get_remote_port_parent (ep); -of_node_put (ep); - -return parent; -} -int tilcdc_attach_external_device (struct drm_device *ddev) {struct tilcdc_drm_private *priv = ddev->dev_private;@@ -227,7 +194,7 @@ int tilcdc_attach_external_device(struct drm_device *ddev)struct drm_bridge *bridge;int ret; - remote_node =tilcdc_get_remote_node (ddev->dev->of_node); + remote_node =of_graph_get_remote_node (ddev->dev->of_node,0 ,0 );if (!remote_node)return 0 ;@@ -266,35 +233,18 @@ int tilcdc_get_external_components(struct device *dev, struct component_match **match) {
drivers/gpu/drm/tilcdc/tilcdc_external.c int tilcdc_get_external_components(struct device *dev, · line 240
Quoted 10 lines
drivers/gpu/drm/tilcdc/tilcdc_external.c +1
-4struct device_node *node; -struct device_node *ep =NULL ; -int count =0 ; -int ret =0 ; -if (!tilcdc_node_has_port (dev->of_node)) +if (!match)return 0 ;
This will break tilcdc on setups that use the old tilcdc internal panel- or tfp410- support. The driver uses tilcdc_get_external_components() with match == NULL to check if the setup uses graph binding or legacy internal panel/tfp410 support.
My intention is to get rid off the legacy internal encoder and connector support (I even did that once already, but DRM had lot of infrastructure changes in that area and my changes became obsolete), but we still need it.
Quoted 18 lines
drivers/gpu/drm/tilcdc/tilcdc_external.c +1
-15-while ((ep =of_graph_get_next_endpoint (dev->of_node, ep))) { - node =of_graph_get_remote_port_parent (ep); -if (!node || !of_device_is_available (node)) { -of_node_put (node); -continue ; - } - -dev_dbg (dev,"Subdevice node '%s' found\n" , node->name); - -if (of_device_is_compatible (node,"nxp,tda998x" )) { -if (match) -drm_of_component_match_add (dev, match, - dev_match_of, node); - ret =1 ; - } + node =of_graph_get_remote_node (dev->of_node,0 ,0 );
drivers/gpu/drm/tilcdc/tilcdc_external.c int tilcdc_get_external_components(struct device *dev, · line 299
Quoted 10 lines
drivers/gpu/drm/tilcdc/tilcdc_external.c +2
-5+if (!of_device_is_compatible (node,"nxp,tda998x" )) {of_node_put (node); -if (count++ >1 ) { -dev_err (dev,"Only one port is supported\n" ); -return -EINVAL ; - } +return 0 ; } -return ret;
Simply remove the above mentioned if statement add and this here:
if (match)
Quoted 4 lines
drivers/gpu/drm/tilcdc/tilcdc_external.c +3
-0+drm_of_component_match_add (dev, match, dev_match_of, node); +of_node_put (node); +return 1 ;}
Best regards,
Jyri
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/5] of: introduce of_graph_get_remote_node
In reply to Rob HerringQuoted 7 lines · Rob Herring
The OF graph API leaves too much of the graph walking to clients when in many cases the driver doesn't care about accessing the port or endpoint nodes. The drivers typically just want the device connected via a particular graph connection.
of_graph_get_remote_nodeprovides this functionality.Signed-off-by Rob Herring <[email protected]>
Just a quick procedural comment: drm-misc for 4.11 is closed already, but if we can get this core patch into 4.11 still then that would avoid cross-tree sync pains in 4.12 ...
-Daniel
Quoted 74 lines
--- drivers/of/base.c | 28 ++++++++++++++++++++++++++++ include/linux/of_graph.h | 8 ++++++++ 2 files changed, 36 insertions(+)drivers/of/base.c +28
-0@@ -2469,3 +2469,31 @@ struct device_node *of_graph_get_remote_port(const struct device_node *node)return of_get_next_parent (np); }EXPORT_SYMBOL (of_graph_get_remote_port); + +struct device_node *of_graph_get_remote_node (const struct device_node *node, +int port,int endpoint) +{ +struct device_node *endpoint_node, *remote; + + endpoint_node =of_graph_get_endpoint_by_regs (node, port, endpoint); +if (!endpoint_node) { +pr_debug ("no valid endpoint (%d, %d) for node %s\n" , + port, endpoint, node->full_name); +return NULL ; + } + + remote =of_graph_get_remote_port_parent (endpoint_node); +of_node_put (endpoint); +if (!remote) { +pr_debug ("no valid remote node\n" ); +return NULL ; + } + +if (!of_device_is_available (remote)) { +pr_debug ("not available for remote node\n" ); +return NULL ; + } + +return remote; +} +EXPORT_SYMBOL (of_graph_get_remote_node);include/linux/of_graph.h +8
-0@@ -51,6 +51,8 @@ struct device_node *of_graph_get_endpoint_by_regs(struct device_node *of_graph_get_remote_port_parent (const struct device_node *node);struct device_node *of_graph_get_remote_port (const struct device_node *node); +struct device_node *of_graph_get_remote_node (const struct device_node *node, +int port,int endpoint);#else static inline int of_graph_parse_endpoint(const struct device_node *node,@@ -89,6 +91,12 @@ static inline struct device_node *of_graph_get_remote_port( {return NULL ; } +static inline struct device_node *of_graph_get_remote_node ( +const struct device_node *node, +int port,int endpoint) +{ +return NULL ; +}#endif /* CONFIG_OF */ Signature · 6 lines
2.10.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH 4/5] drm: convert drivers to use drm_of_find_panel_or_bridge
In reply to Rob HerringHi Rob,
Quoted 10 lines · Rob Herring
Similar to the previous commit, convert drivers open coding OF graph parsing to use
drm_of_find_panel_or_bridgeinstead.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
Signed-off-by Rob Herring <[email protected]>---
[..]
Quoted 16 lines
drivers/gpu/drm/sun4i/sun4i_rgb.c +1
-0@@ -15,6 +15,7 @@#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include "sun4i_drv.h" @@ -217,12 +218,10 @@ int sun4i_rgb_init(struct drm_device *drm) rgb->drv = drv; encoder = &rgb->encoder;
drivers/gpu/drm/sun4i/sun4i_rgb.c int sun4i_rgb_init(struct drm_device *drm) · line 224
Quoted 10 lines
drivers/gpu/drm/sun4i/sun4i_rgb.c +4
-6- tcon->panel =sun4i_tcon_find_panel (tcon->dev->of_node); - encoder->bridge =sun4i_tcon_find_bridge (tcon->dev->of_node); -if (IS_ERR (tcon->panel) &&IS_ERR (encoder->bridge)) { -dev_info (drm->dev,"No panel or bridge found... RGB output disabled\n" ); -return 0 ; - } + ret =drm_of_find_panel_or_bridge (tcon->dev->of_node,1 ,0 , + &tcon->panel, &encoder->bridge); +if (ret) +return ret;
It used to ignore the error if it couldn't find the bridge. This will break the probe.
Quoted 75 lines
drivers/gpu/drm/sun4i/sun4i_rgb.c +2
-4drm_encoder_helper_add (&rgb->encoder, &sun4i_rgb_enc_helper_funcs);@@ -239,7 +238,7 @@ int sun4i_rgb_init(struct drm_device *drm)/* The RGB encoder can only work with the TCON channel 0 */ rgb->encoder.possible_crtcs =BIT (0 ); -if (!IS_ERR (tcon->panel)) { +if (tcon->panel) {drm_connector_helper_add (&rgb->connector, &sun4i_rgb_con_helper_funcs); ret = drm_connector_init(drm, &rgb->connector,@@ -260,7 +259,7 @@ int sun4i_rgb_init(struct drm_device *drm) } } -if (!IS_ERR (encoder->bridge)) { +if (encoder->bridge) { encoder->bridge->encoder = &rgb->encoder; ret =drm_bridge_attach (drm, encoder->bridge);@@ -268,8 +267,6 @@ int sun4i_rgb_init(struct drm_device *drm)dev_err (drm->dev,"Couldn't attach our bridge\n" ); goto err_cleanup_connector; } - }else { - encoder->bridge =NULL ; }return 0 ;drivers/gpu/drm/sun4i/sun4i_tcon.c +1
-24@@ -15,13 +15,12 @@#include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_modes.h> -#include <drm/drm_panel.h> +#include <drm/drm_of.h> #include <linux/component.h> #include <linux/ioport.h> #include <linux/of_address.h> #include <linux/of_device.h> -#include <linux/of_graph.h> #include <linux/of_irq.h> #include <linux/regmap.h> #include <linux/reset.h> @@ -405,74 +404,6 @@ static int sun4i_tcon_init_regmap(struct device *dev,return 0 ; } -struct drm_panel *sun4i_tcon_find_panel (struct device_node *node) -{ -struct device_node *port, *remote, *child; -struct device_node *end_node =NULL ; - -/* Inputs are listed first, then outputs */ - port =of_graph_get_port_by_id (node,1 ); - -/* -* Our first output is the RGB interface where the panel will -* be connected. -*/ -for_each_child_of_node (port, child) { -u32 reg; - -of_property_read_u32 (child,"reg" , ®); -if (reg ==0 ) - end_node = child; - } - -if (!end_node) { -DRM_DEBUG_DRIVER ("Missing panel endpoint\n" );
drivers/gpu/drm/sun4i/sun4i_tcon.c static int sun4i_tcon_init_regmap(struct device *dev, · line 439
Quoted 10 lines
drivers/gpu/drm/sun4i/sun4i_tcon.c +0
-10-return ERR_PTR (-ENODEV ); - } - - remote =of_graph_get_remote_port_parent (end_node); -if (!remote) { -DRM_DEBUG_DRIVER ("Unable to parse remote node\n" ); -return ERR_PTR (-EINVAL ); - } - -return of_drm_find_panel (remote) ?:ERR_PTR (-EPROBE_DEFER );
And the panel is only one of our endpoints, which is optional, while other endpoints are mandatory. This means that we might very well have an endpoint that is not a panel or a bridge. In this case, I think your function will return an error and will be treated as such, while it's really the expected behaviour.
I think it's better to leave this driver alone for now, it's not as trivial as it looks, and will require some testing to get things right. I'll try to get my head around how to use your new (very welcome) helpers.
Maxime
Signature · 3 lines
Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
Re: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
In reply to Rob HerringQuoted 35 lines · Rob Herring
Convert drivers to use the new
of_graph_get_remote_node()helper instead of parsing the endpoint node and then getting the remote device node. Now drivers can just specify the device node and which port/endpoint and get back the connected remote device node. The details of the graph binding are nicely abstracted into the core OF graph code.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/arm/hdlcd_drv.c | 22 ++------- drivers/gpu/drm/arm/malidp_drv.c | 29 ++--------- drivers/gpu/drm/bridge/adv7511/adv7533.c | 12 +---- drivers/gpu/drm/bridge/dumb-vga-dac.c | 15 ++---- drivers/gpu/drm/bridge/ti-tfp410.c | 15 ++---- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 16 +----- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 ++--- drivers/gpu/drm/exynos/exynos_drm_mic.c | 27 +--------- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 26 ++-------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 30 +---------- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 ++-------- drivers/gpu/drm/meson/meson_drv.c | 12 ++--- drivers/gpu/drm/meson/meson_venc_cvbs.c | 19 ++----- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +---------- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 18 +++---- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 11 +---- drivers/gpu/drm/tilcdc/tilcdc_external.c | 66 +++---------------------- drivers/gpu/drm/vc4/vc4_dpi.c | 15 ++---- 20 files changed, 64 insertions(+), 351 deletions(-)
[...]
Quoted 49 lines
drivers/gpu/drm/meson/meson_drv.c +6
-6@@ -163,14 +163,14 @@ static struct drm_driver meson_driver = {static bool meson_vpu_has_available_connectors (struct device *dev) { -struct device_node *ep, *remote; +struct device_node *remote; +int i; -/* Parses each endpoint and check if remote exists */ -for_each_endpoint_of_node (dev->of_node, ep) { -/* If the endpoint node exists, consider it enabled */ - remote =of_graph_get_remote_port (ep); -if (remote) +for_each_of_graph_remote_node (dev->of_node, remote, i,2 ) { +if (remote) { +of_node_put (remote);return true; + } }return false;drivers/gpu/drm/meson/meson_venc_cvbs.c +3
-10@@ -217,25 +217,14 @@ static const struct drm_encoder_helper_funcsstatic bool meson_venc_cvbs_connector_is_available (struct meson_drm *priv) { -struct device_node *ep, *remote; +struct device_node *remote; -/* CVBS VDAC output is on the first port, first endpoint */ - ep =of_graph_get_endpoint_by_regs (priv->dev->of_node,0 ,0 ); -if (!ep) + remote =of_graph_get_remote_node (priv->dev->of_node,0 ,0 ); +if (!remote)return false; - -/* If the endpoint node exists, consider it enabled */ - remote =of_graph_get_remote_port (ep); -if (remote) { -of_node_put (ep); -return true;
drivers/gpu/drm/meson/meson_venc_cvbs.c static const struct drm_encoder_helper_funcs · line 230
Quoted 10 lines
drivers/gpu/drm/meson/meson_venc_cvbs.c +1
-5- } - -of_node_put (ep);of_node_put (remote); - -return false; +return true; }int meson_venc_cvbs_create (struct meson_drm *priv)
[...]
Hi Rob,
For the meson changes :
Thanks !
Neil
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Liviu Dudau
maintainerRe: [PATCH 2/5] drm: of: introduce drm_of_find_panel_or_bridge
In reply to Rob HerringQuoted 39 lines · Rob Herring
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 <[email protected]>--- drivers/gpu/drm/drm_of.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_of.h | 13 +++++++++++++ 2 files changed, 63 insertions(+)drivers/gpu/drm/drm_of.c +10
-0@@ -3,7 +3,9 @@#include <linux/list.h> #include <linux/of_graph.h> #include <drm/drmP.h> +#include <drm/drm_bridge.h> #include <drm/drm_crtc.h> +#include <drm/drm_panel.h> #include <drm/drm_of.h> static void drm_release_of (struct device *dev,void *data)@@ -207,3 +209,51 @@ 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 input 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
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 229
Quoted 10 lines
drivers/gpu/drm/drm_of.c +10
-0+* return either the associated struct drm_panel or drm_bridge device. +* +* 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 = -ENODEV ;
Given that you never return 'ret' with -ENODEV can I suggest that you initialise 'ret' with -EPROBE_DEFER and then you can get rid of the two assignments further down?
Otherwise, looks good to me.
Best regards,
Liviu
Quoted 71 lines
drivers/gpu/drm/drm_of.c +30
-0+struct device_node *remote; + + remote =of_graph_get_remote_node (np, port, endpoint); +if (!remote) +return -ENODEV ; + +if (bridge) + *bridge =NULL ; + +if (panel) { + *panel =of_drm_find_panel (remote); +if (*panel) { + ret =0 ; + goto out_put; + } + ret = -EPROBE_DEFER ; + } + +if (bridge) { + *bridge =of_drm_find_bridge (remote); +if (*bridge) + ret =0 ; +else + ret = -EPROBE_DEFER ; + } +out_put: +of_node_put (remote); +return ret; +} +EXPORT_SYMBOL_GPL (drm_of_find_panel_or_bridge);include/drm/drm_of.h +13
-0@@ -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,Signature · 1 line
2.10.1
Signature · 12 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.htmlLiviu Dudau
maintainerRe: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
In reply to Rob HerringQuoted 58 lines · Rob Herring
Convert drivers to use the new
of_graph_get_remote_node()helper instead of parsing the endpoint node and then getting the remote device node. Now drivers can just specify the device node and which port/endpoint and get back the connected remote device node. The details of the graph binding are nicely abstracted into the core OF graph code.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/arm/hdlcd_drv.c | 22 ++------- drivers/gpu/drm/arm/malidp_drv.c | 29 ++--------- drivers/gpu/drm/bridge/adv7511/adv7533.c | 12 +---- drivers/gpu/drm/bridge/dumb-vga-dac.c | 15 ++---- drivers/gpu/drm/bridge/ti-tfp410.c | 15 ++---- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 16 +----- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 ++--- drivers/gpu/drm/exynos/exynos_drm_mic.c | 27 +--------- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 26 ++-------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 30 +---------- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 ++-------- drivers/gpu/drm/meson/meson_drv.c | 12 ++--- drivers/gpu/drm/meson/meson_venc_cvbs.c | 19 ++----- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +---------- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 18 +++---- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 11 +---- drivers/gpu/drm/tilcdc/tilcdc_external.c | 66 +++---------------------- drivers/gpu/drm/vc4/vc4_dpi.c | 15 ++---- 20 files changed, 64 insertions(+), 351 deletions(-)drivers/gpu/drm/arm/hdlcd_drv.c +2
-10@@ -430,29 +430,13 @@ static int compare_dev(struct device *dev, void *data)static int hdlcd_probe (struct platform_device *pdev) { -struct device_node *port, *ep; +struct device_node *port;struct component_match *match =NULL ; -if (!pdev->dev.of_node) -return -ENODEV ; -/* there is only one output port inside each device, find it */ - ep =of_graph_get_next_endpoint (pdev->dev.of_node,NULL ); -if (!ep) -return -ENODEV ; - -if (!of_device_is_available (ep)) { -of_node_put (ep); + port =of_graph_get_remote_node (pdev->dev.of_node,0 ,0 );
drivers/gpu/drm/arm/hdlcd_drv.c static int compare_dev(struct device *dev, void *data) · line 454
Quoted 10 lines
drivers/gpu/drm/arm/hdlcd_drv.c +1
-8+if (!port)return -ENODEV ; - } - -/* add the remote encoder port as component */ - port =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!port || !of_device_is_available (port)) { -of_node_put (port); -return -EAGAIN ;
The HDLCD change looks reasonable except for this -EAGAIN business. I'll have to test your changes on my setup to see how this affects having the encoder as a module.
Quoted 31 lines
drivers/gpu/drm/arm/hdlcd_drv.c +0
-1- }drm_of_component_match_add (&pdev->dev, &match, compare_dev, port);of_node_put (port);drivers/gpu/drm/arm/malidp_drv.c +1
-7@@ -262,7 +262,6 @@ static int malidp_bind(struct device *dev) {struct resource *res;struct drm_device *drm; -struct device_node *ep;struct malidp_drm *malidp;struct malidp_hw_device *hwdev;struct platform_device *pdev =to_platform_device (dev);@@ -360,12 +359,7 @@ static int malidp_bind(struct device *dev) goto init_fail;/* Set the CRTC's port so that the encoder component can find it */ - ep =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (!ep) { - ret = -EINVAL ; - goto port_fail; - } - malidp->crtc.port =of_get_next_parent (ep); + malidp->crtc.port =of_graph_get_port_by_id (dev->of_node,0 ); ret =component_bind_all (dev, drm);if (ret) {
drivers/gpu/drm/arm/malidp_drv.c static int malidp_bind(struct device *dev) · line 421
Quoted 4 lines
drivers/gpu/drm/arm/malidp_drv.c +0
-1@@ -418,9 +412,7 @@ static int malidp_bind(struct device *dev) irq_init_fail:component_unbind_all (dev, drm); bind_fail: -of_node_put (malidp->crtc.port);
Why removing this line? AFAICT this is still needed, according to of_graph_get_port_by_id() documentation.
Quoted 25 lines
drivers/gpu/drm/arm/malidp_drv.c +3
-8malidp->crtc.port =NULL ; -port_fail:malidp_fini (drm); init_fail: drm->dev_private =NULL ;@@ -478,29 +470,16 @@ static int malidp_compare_dev(struct device *dev, void *data)static int malidp_platform_probe (struct platform_device *pdev) { -struct device_node *port, *ep; +struct device_node *port;struct component_match *match =NULL ;if (!pdev->dev.of_node)return -ENODEV ;/* there is only one output port inside each device, find it */ - ep =of_graph_get_next_endpoint (pdev->dev.of_node,NULL ); -if (!ep) -return -ENODEV ; - -if (!of_device_is_available (ep)) { -of_node_put (ep); + port =of_graph_get_remote_node (pdev->dev.of_node,0 ,0 ); +if (!port)
drivers/gpu/drm/arm/malidp_drv.c static int malidp_compare_dev(struct device *dev, void *data) · line 503
Quoted 10 lines
drivers/gpu/drm/arm/malidp_drv.c +0
-9return -ENODEV ; - } - -/* add the remote encoder port as component */ - port =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!port || !of_device_is_available (port)) { -of_node_put (port); -return -EAGAIN ; - }
This looks good for mali-dp as well (except above comment), I will give it a run through my setup.
Best regards,
Liviu
Quoted 690 lines
drivers/gpu/drm/arm/malidp_drv.c +0
-0drm_of_component_match_add (&pdev->dev, &match, malidp_compare_dev, port);drivers/gpu/drm/bridge/adv7511/adv7533.c +2
-10@@ -232,7 +232,6 @@ void adv7533_detach_dsi(struct adv7511 *adv)int adv7533_parse_dt (struct device_node *np,struct adv7511 *adv) {u32 num_lanes; -struct device_node *endpoint;of_property_read_u32 (np,"adi,dsi-lanes" , &num_lanes);@@ -241,17 +240,10 @@ int adv7533_parse_dt(struct device_node *np, struct adv7511 *adv) adv->num_dsi_lanes = num_lanes; - endpoint =of_graph_get_next_endpoint (np,NULL ); -if (!endpoint) + adv->host_node =of_graph_get_remote_node (np,0 ,0 ); +if (!adv->host_node)return -ENODEV ; - adv->host_node =of_graph_get_remote_port_parent (endpoint); -if (!adv->host_node) { -of_node_put (endpoint); -return -ENODEV ; - } - -of_node_put (endpoint);of_node_put (adv->host_node); adv->use_timing_gen = !of_property_read_bool(np,drivers/gpu/drm/bridge/dumb-vga-dac.c +3
-12@@ -154,21 +154,12 @@ static const struct drm_bridge_funcs dumb_vga_bridge_funcs = {static struct i2c_adapter *dumb_vga_retrieve_ddc (struct device *dev) { -struct device_node *end_node, *phandle, *remote; +struct device_node *phandle, *remote;struct i2c_adapter *ddc; - end_node =of_graph_get_endpoint_by_regs (dev->of_node,1 ,-1 ); -if (!end_node) { -dev_err (dev,"Missing connector endpoint\n" ); -return ERR_PTR (-ENODEV ); - } - - remote =of_graph_get_remote_port_parent (end_node); -of_node_put (end_node); -if (!remote) { -dev_err (dev,"Enable to parse remote node\n" ); + remote =of_graph_get_remote_node (dev->of_node,1 ,-1 ); +if (!remote)return ERR_PTR (-EINVAL ); - } phandle =of_parse_phandle (remote,"ddc-i2c-bus" ,0 );of_node_put (remote);drivers/gpu/drm/bridge/ti-tfp410.c +5
-10@@ -127,18 +127,13 @@ static const struct drm_bridge_funcs tfp410_bridge_funcs = {static int tfp410_get_connector_ddc (struct tfp410 *dvi) { -struct device_node *ep =NULL , *connector_node =NULL ; -struct device_node *ddc_phandle =NULL ; +struct device_node *connector_node, *ddc_phandle;int ret =0 ;/* port@1 is the connector node */ - ep =of_graph_get_endpoint_by_regs (dvi->dev->of_node,1 ,-1 ); -if (!ep) - goto fail; - - connector_node =of_graph_get_remote_port_parent (ep); + connector_node =of_graph_get_remote_node (dvi->dev->of_node,1 ,-1 );if (!connector_node) - goto fail; +return -ENODEV ; ddc_phandle =of_parse_phandle (connector_node,"ddc-i2c-bus" ,0 );if (!ddc_phandle)@@ -150,10 +145,10 @@ static int tfp410_get_connector_ddc(struct tfp410 *dvi)else ret = -EPROBE_DEFER ; +of_node_put (ddc_phandle); + fail: -of_node_put (ep);of_node_put (connector_node); -of_node_put (ddc_phandle);return ret; }drivers/gpu/drm/exynos/exynos_drm_dpi.c +1
-15@@ -164,27 +164,13 @@ enum { FIMD_PORT_WRB, }; -static struct device_node *exynos_dpi_of_find_panel_node (struct device *dev) -{ -struct device_node *np, *ep; - - ep =of_graph_get_endpoint_by_regs (dev->of_node,FIMD_PORT_RGB ,0 ); -if (!ep) -return NULL ; - - np =of_graph_get_remote_port_parent (ep); -of_node_put (ep); - -return np; -} -static int exynos_dpi_parse_dt (struct exynos_dpi *ctx) {struct device *dev = ctx->dev;struct device_node *dn = dev->of_node;struct device_node *np; - ctx->panel_node =exynos_dpi_of_find_panel_node (dev); + ctx->panel_node =of_graph_get_remote_node (dn,FIMD_PORT_RGB ,0 ); np =of_get_child_by_name (dn,"display-timings" );if (np) {drivers/gpu/drm/exynos/exynos_drm_dsi.c +3
-10@@ -1670,17 +1670,10 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)of_node_put (ep); - ep =of_graph_get_next_endpoint (node,NULL ); -if (!ep) { - ret = -EINVAL ; - goto end; - } + dsi->bridge_node =of_graph_get_remote_node (node,DSI_PORT_OUT ,0 ); +if (!dsi->bridge_node) +return -EINVAL ; - dsi->bridge_node =of_graph_get_remote_port_parent (ep); -if (!dsi->bridge_node) { - ret = -EINVAL ; - goto end; - } end:of_node_put (ep);drivers/gpu/drm/exynos/exynos_drm_mic.c +2
-25@@ -228,29 +228,6 @@ static void mic_set_reg_on(struct exynos_mic *mic, bool enable)writel (reg, mic->reg +MIC_OP ); } -static struct device_node *get_remote_node (struct device_node *from,int reg) -{ -struct device_node *endpoint =NULL , *remote_node =NULL ; - - endpoint =of_graph_get_endpoint_by_regs (from, reg,-1 ); -if (!endpoint) { -DRM_ERROR ("mic: Failed to find remote port from %s" , - from->full_name); - goto exit; - } - - remote_node =of_graph_get_remote_port_parent (endpoint); -if (!remote_node) { -DRM_ERROR ("mic: Failed to find remote port parent from %s" , - from->full_name); - goto exit; - } - -exit: -of_node_put (endpoint); -return remote_node; -} -static int parse_dt (struct exynos_mic *mic) {int ret =0 , i, j;@@ -262,7 +239,7 @@ static int parse_dt(struct exynos_mic *mic)* The first node must be for decon and the second one must be for dsi. */ for (i =0 , j =0 ; i <NUM_ENDPOINTS ; i++) { - remote_node =get_remote_node (mic->dev->of_node, i); + remote_node =of_graph_get_remote_node (mic->dev->of_node, i,0 );if (!remote_node) { ret = -EPIPE ; goto exit;@@ -279,7 +256,7 @@ static int parse_dt(struct exynos_mic *mic)break ;case ENDPOINT_DSI_NODE :/* panel node */ - remote_node =get_remote_node (remote_node,1 ); + remote_node =of_graph_get_remote_node (remote_node,1 ,0 );if (!remote_node) { ret = -EPIPE ; goto exit;drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +4
-22@@ -757,34 +757,16 @@ static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi) {struct dsi_hw_ctx *ctx = dsi->ctx;struct device_node *np = pdev->dev.of_node; -struct device_node *endpoint, *bridge_node; -struct drm_bridge *bridge; +struct device_node *bridge_node;struct resource *res;/* * Get the endpoint node. In our case, dsi has one output port1 * to which the external HDMI bridge is connected. */ - endpoint =of_graph_get_endpoint_by_regs (np,1 ,-1 ); -if (!endpoint) { -DRM_ERROR ("no valid endpoint node\n" ); -return -ENODEV ; - } -of_node_put (endpoint); - - bridge_node =of_graph_get_remote_port_parent (endpoint); -if (!bridge_node) { -DRM_ERROR ("no valid bridge node\n" ); -return -ENODEV ; - } -of_node_put (bridge_node); - - bridge =of_drm_find_bridge (bridge_node); -if (!bridge) { -DRM_INFO ("wait for external HDMI bridge driver.\n" ); -return -EPROBE_DEFER ; - } - dsi->bridge = bridge; + ret =drm_of_find_panel_or_bridge (np,NULL , &dsi->bridge); +if (ret) +return ret; ctx->pclk =devm_clk_get (&pdev->dev,"pclk" );if (IS_ERR (ctx->pclk)) {drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +1
-29@@ -247,34 +247,6 @@ static const struct component_master_ops kirin_drm_ops = { .unbind = kirin_drm_unbind, }; -static struct device_node *kirin_get_remote_node (struct device_node *np) -{ -struct device_node *endpoint, *remote; - -/* get the first endpoint, in our case only one remote node -* is connected to display controller. -*/ - endpoint =of_graph_get_next_endpoint (np,NULL ); -if (!endpoint) { -DRM_ERROR ("no valid endpoint node\n" ); -return ERR_PTR (-ENODEV ); - } - - remote =of_graph_get_remote_port_parent (endpoint); -of_node_put (endpoint); -if (!remote) { -DRM_ERROR ("no valid remote node\n" ); -return ERR_PTR (-ENODEV ); - } - -if (!of_device_is_available (remote)) { -DRM_ERROR ("not available for remote node\n" ); -return ERR_PTR (-ENODEV ); - } - -return remote; -} -static int kirin_drm_platform_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;@@ -288,7 +260,7 @@ static int kirin_drm_platform_probe(struct platform_device *pdev)return -EINVAL ; } - remote =kirin_get_remote_node (np); + remote =of_graph_get_remote_node (np,0 ,0 );if (IS_ERR (remote))return PTR_ERR (remote);drivers/gpu/drm/mediatek/mtk_dpi.c +3
-9@@ -661,7 +661,7 @@ static int mtk_dpi_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct mtk_dpi *dpi;struct resource *mem; -struct device_node *ep, *bridge_node =NULL ; +struct device_node *bridge_node;int comp_id;int ret;@@ -706,15 +706,9 @@ static int mtk_dpi_probe(struct platform_device *pdev)return -EINVAL ; } - ep =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (ep) { - bridge_node =of_graph_get_remote_port_parent (ep); -of_node_put (ep); - } -if (!bridge_node) { -dev_err (dev,"Failed to find bridge node\n" ); + bridge_node =of_graph_get_remote_node (dev->of_node,0 ,0 ); +if (!bridge_node)return -ENODEV ; - }dev_info (dev,"Found bridge node: %s\n" , bridge_node->full_name);drivers/gpu/drm/mediatek/mtk_hdmi.c +3
-23@@ -1433,7 +1433,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, {struct device *dev = &pdev->dev;struct device_node *np = dev->of_node; -struct device_node *cec_np, *port, *ep, *remote, *i2c_np; +struct device_node *cec_np, *remote, *i2c_np;struct platform_device *cec_pdev;struct regmap *regmap;struct resource *mem;@@ -1485,29 +1485,9 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,if (IS_ERR (hdmi->regs))return PTR_ERR (hdmi->regs); - port =of_graph_get_port_by_id (np,1 ); -if (!port) { -dev_err (dev,"Missing output port node\n" ); + remote =of_graph_get_remote_node (np,1 ,0 ); +if (!remote)return -EINVAL ; - } - - ep =of_get_child_by_name (port,"endpoint" ); -if (!ep) { -dev_err (dev,"Missing endpoint node in port %s\n" , - port->full_name); -of_node_put (port); -return -EINVAL ; - } -of_node_put (port); - - remote =of_graph_get_remote_port_parent (ep); -if (!remote) { -dev_err (dev,"Missing connector/bridge node for endpoint %s\n" , - ep->full_name); -of_node_put (ep); -return -EINVAL ; - } -of_node_put (ep);if (!of_device_is_compatible (remote,"hdmi-connector" )) { hdmi->bridge.next =of_drm_find_bridge (remote);drivers/gpu/drm/meson/meson_drv.c +6
-6@@ -163,14 +163,14 @@ static struct drm_driver meson_driver = {static bool meson_vpu_has_available_connectors (struct device *dev) { -struct device_node *ep, *remote; +struct device_node *remote; +int i; -/* Parses each endpoint and check if remote exists */ -for_each_endpoint_of_node (dev->of_node, ep) { -/* If the endpoint node exists, consider it enabled */ - remote =of_graph_get_remote_port (ep); -if (remote) +for_each_of_graph_remote_node (dev->of_node, remote, i,2 ) { +if (remote) { +of_node_put (remote);return true; + } }return false;drivers/gpu/drm/meson/meson_venc_cvbs.c +4
-15@@ -217,25 +217,14 @@ static const struct drm_encoder_helper_funcsstatic bool meson_venc_cvbs_connector_is_available (struct meson_drm *priv) { -struct device_node *ep, *remote; +struct device_node *remote; -/* CVBS VDAC output is on the first port, first endpoint */ - ep =of_graph_get_endpoint_by_regs (priv->dev->of_node,0 ,0 ); -if (!ep) + remote =of_graph_get_remote_node (priv->dev->of_node,0 ,0 ); +if (!remote)return false; - -/* If the endpoint node exists, consider it enabled */ - remote =of_graph_get_remote_port (ep); -if (remote) { -of_node_put (ep); -return true; - } - -of_node_put (ep);of_node_put (remote); - -return false; +return true; }int meson_venc_cvbs_create (struct meson_drm *priv)drivers/gpu/drm/msm/dsi/dsi_host.c +1
-2@@ -1637,9 +1637,8 @@ static int dsi_host_parse_dt(struct msm_dsi_host *msm_host) }/* Get panel node from the output port's endpoint data */ - device_node =of_graph_get_remote_port_parent (endpoint); + device_node =of_graph_get_remote_node (np,1 ,0 );if (!device_node) { -dev_err (dev,"%s: no valid device\n" , __func__); ret = -ENODEV ; goto err; }drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +1
-27@@ -225,32 +225,6 @@ int mdp4_enable(struct mdp4_kms *mdp4_kms)return 0 ; } -static struct device_node *mdp4_detect_lcdc_panel (struct drm_device *dev) -{ -struct device_node *endpoint, *panel_node; -struct device_node *np = dev->dev->of_node; - -/* -* LVDS/LCDC is the first port described in the list of ports in the -* MDP4 DT node. -*/ - endpoint =of_graph_get_endpoint_by_regs (np,0 ,-1 ); -if (!endpoint) { -DBG ("no LVDS remote endpoint\n" ); -return NULL ; - } - - panel_node =of_graph_get_remote_port_parent (endpoint); -if (!panel_node) { -DBG ("no valid panel node in LVDS endpoint\n" ); -of_node_put (endpoint); -return NULL ; - } - -of_node_put (endpoint); - -return panel_node; -}static int mdp4_modeset_init_intf (struct mdp4_kms *mdp4_kms,int intf_type)@@ -270,7 +244,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,* bail out early if there is no panel node (no need to * initialize LCDC encoder and LVDS connector) */ - panel_node =mdp4_detect_lcdc_panel (dev); + panel_node =of_graph_get_remote_node (dev->dev->of_node,0 ,0 );if (!panel_node)return 0 ;drivers/gpu/drm/rockchip/rockchip_drm_drv.c +6
-12@@ -373,19 +373,13 @@ static void rockchip_add_endpoints(struct device *dev,struct component_match **match, struct device_node *port) { - struct device_node *ep, *remote; + struct device_node *remote; +int i; -for_each_child_of_node (port, ep) { - remote =of_graph_get_remote_port_parent (ep); -if (!remote || !of_device_is_available (remote)) { -of_node_put (remote); -continue ; - }else if (!of_device_is_available (remote->parent)) { -dev_warn (dev,"parent device of %s is not available\n" , - remote->full_name); -of_node_put (remote); +for (i =0 ; i <3 ; i++) { + remote =of_graph_get_remote_node (port,0 , i); +if (!remote)continue ; - }drm_of_component_match_add (dev, match, compare_of, remote);of_node_put (remote);@@ -464,7 +458,7 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev)continue ; } -rockchip_add_endpoints (dev, &match, port); +rockchip_add_endpoints (dev, &match, port->parent);of_node_put (port); }drivers/gpu/drm/tilcdc/tilcdc_crtc.c +1
-10@@ -1013,16 +1013,7 @@ int tilcdc_crtc_create(struct drm_device *dev)drm_crtc_helper_add (crtc, &tilcdc_crtc_helper_funcs);if (priv->is_componentized) { -struct device_node *ports = -of_get_child_by_name (dev->dev->of_node,"ports" ); - -if (ports) { - crtc->port =of_get_child_by_name (ports,"port" ); -of_node_put (ports); - }else { - crtc->port = -of_get_child_by_name (dev->dev->of_node,"port" ); - } + crtc->port =of_graph_get_port_by_id (dev->dev->of_node,0 ,0 );if (!crtc->port) {/* This should never happen */ dev_err (dev->dev,"Port node not found in %s\n" , dev->dev->of_node->full_name);drivers/gpu/drm/tilcdc/tilcdc_external.c +8
-58@@ -187,39 +187,6 @@ int tilcdc_attach_bridge(struct drm_device *ddev, struct drm_bridge *bridge)return ret; } -static int tilcdc_node_has_port (struct device_node *dev_node) -{ -struct device_node *node; - - node =of_get_child_by_name (dev_node,"ports" ); -if (!node) - node =of_get_child_by_name (dev_node,"port" ); -if (!node) -return 0 ; -of_node_put (node); - -return 1 ; -} - -static -struct device_node *tilcdc_get_remote_node (struct device_node *node) -{ -struct device_node *ep; -struct device_node *parent; - -if (!tilcdc_node_has_port (node)) -return NULL ; - - ep =of_graph_get_next_endpoint (node,NULL ); -if (!ep) -return NULL ; - - parent =of_graph_get_remote_port_parent (ep); -of_node_put (ep); - -return parent; -} -int tilcdc_attach_external_device (struct drm_device *ddev) {struct tilcdc_drm_private *priv = ddev->dev_private;@@ -227,7 +194,7 @@ int tilcdc_attach_external_device(struct drm_device *ddev)struct drm_bridge *bridge;int ret; - remote_node =tilcdc_get_remote_node (ddev->dev->of_node); + remote_node =of_graph_get_remote_node (ddev->dev->of_node,0 ,0 );if (!remote_node)return 0 ;@@ -266,35 +233,18 @@ int tilcdc_get_external_components(struct device *dev, struct component_match **match) {struct device_node *node; -struct device_node *ep =NULL ; -int count =0 ; -int ret =0 ; -if (!tilcdc_node_has_port (dev->of_node)) +if (!match)return 0 ; -while ((ep =of_graph_get_next_endpoint (dev->of_node, ep))) { - node =of_graph_get_remote_port_parent (ep); -if (!node || !of_device_is_available (node)) { -of_node_put (node); -continue ; - } - -dev_dbg (dev,"Subdevice node '%s' found\n" , node->name); - -if (of_device_is_compatible (node,"nxp,tda998x" )) { -if (match) -drm_of_component_match_add (dev, match, - dev_match_of, node); - ret =1 ; - } + node =of_graph_get_remote_node (dev->of_node,0 ,0 ); +if (!of_device_is_compatible (node,"nxp,tda998x" )) {of_node_put (node); -if (count++ >1 ) { -dev_err (dev,"Only one port is supported\n" ); -return -EINVAL ; - } +return 0 ; } -return ret; +drm_of_component_match_add (dev, match, dev_match_of, node); +of_node_put (node); +return 1 ; }drivers/gpu/drm/vc4/vc4_dpi.c +3
-12@@ -366,23 +366,14 @@ static const struct of_device_id vc4_dpi_dt_match[] = {*/ static struct drm_panel *vc4_dpi_get_panel (struct device *dev) { -struct device_node *endpoint, *panel_node; +struct device_node *panel_node;struct device_node *np = dev->of_node;struct drm_panel *panel; - endpoint =of_graph_get_next_endpoint (np,NULL ); -if (!endpoint) { -dev_err (dev,"no endpoint to fetch DPI panel\n" ); -return NULL ; - } -/* don't proceed if we have an endpoint but no panel_node tied to it */ - panel_node =of_graph_get_remote_port_parent (endpoint); -of_node_put (endpoint); -if (!panel_node) { -dev_err (dev,"no valid panel node\n" ); + panel_node =of_graph_get_remote_node (np,0 ,0 ); +if (!panel_node)return NULL ; - } panel =of_drm_find_panel (panel_node);of_node_put (panel_node);Signature · 1 line
2.10.1
Signature · 12 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.htmlRe: [PATCH 1/5] of: introduce of_graph_get_remote_node
In reply to Rob HerringHi Rob,
thanks for this clean-up series! I was not aware how far the duplication has spread over time.
Quoted 17 lines · Rob Herring
The OF graph API leaves too much of the graph walking to clients when in many cases the driver doesn't care about accessing the port or endpoint nodes. The drivers typically just want the device connected via a particular graph connection.
of_graph_get_remote_nodeprovides this functionality.Signed-off-by Rob Herring <[email protected]>--- drivers/of/base.c | 28 ++++++++++++++++++++++++++++ include/linux/of_graph.h | 8 ++++++++ 2 files changed, 36 insertions(+)drivers/of/base.c +0
-0
drivers/of/base.c struct device_node *of_graph_get_remote_port(const struct device_node *node) · line 2474
Quoted 6 lines
drivers/of/base.c +3
-0@@ -2469,3 +2469,31 @@ struct device_node *of_graph_get_remote_port(const struct device_node *node)return of_get_next_parent (np); }EXPORT_SYMBOL (of_graph_get_remote_port); + +struct device_node *of_graph_get_remote_node (const struct device_node *node, +int port,int endpoint)
I think this should have a documentation comment, similar to the of_graph_get_endpoint_by_regs one, as it is not really clear from the function name that the returned device node is the parent (or grandparent) device node containing the remote port to the specified node & port & endpoint.
Also it might be interesting to the user that -1 is a wildcard value for port / endpoint.
drivers/of/base.c struct device_node *of_graph_get_remote_port(const struct device_node *node) · line 2486
Quoted 12 lines
drivers/of/base.c +12
-0+{ +struct device_node *endpoint_node, *remote; + + endpoint_node =of_graph_get_endpoint_by_regs (node, port, endpoint); +if (!endpoint_node) { +pr_debug ("no valid endpoint (%d, %d) for node %s\n" , + port, endpoint, node->full_name); +return NULL ; + } + + remote =of_graph_get_remote_port_parent (endpoint_node); +of_node_put (endpoint);
Vladimir pointed this out already. With that fixed and the missing doc comment added,
Quoted 28 lines
drivers/of/base.c +13
-0+if (!remote) { +pr_debug ("no valid remote node\n" ); +return NULL ; + } + +if (!of_device_is_available (remote)) { +pr_debug ("not available for remote node\n" ); +return NULL ; + } + +return remote; +} +EXPORT_SYMBOL (of_graph_get_remote_node);include/linux/of_graph.h +2
-0@@ -51,6 +51,8 @@ struct device_node *of_graph_get_endpoint_by_regs(struct device_node *of_graph_get_remote_port_parent (const struct device_node *node);struct device_node *of_graph_get_remote_port (const struct device_node *node); +struct device_node *of_graph_get_remote_node (const struct device_node *node, +int port,int endpoint);#else static inline int of_graph_parse_endpoint(const struct device_node *node,@@ -89,6 +91,12 @@ static inline struct device_node *of_graph_get_remote_port( {
include/linux/of_graph.h static inline struct device_node *of_graph_get_remote_port( · line 101
Quoted 10 lines
include/linux/of_graph.h +6
-0return NULL; } +static inline struct device_node *of_graph_get_remote_node ( +const struct device_node *node, +int port,int endpoint) +{ +return NULL ; +}#endif /* CONFIG_OF */
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Philipp Zabel
maintainerRe: [PATCH 2/5] drm: of: introduce drm_of_find_panel_or_bridge
In reply to Rob HerringQuoted 30 lines · Rob Herring
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 <[email protected]>--- drivers/gpu/drm/drm_of.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_of.h | 13 +++++++++++++ 2 files changed, 63 insertions(+)drivers/gpu/drm/drm_of.c +2
-0@@ -3,7 +3,9 @@#include <linux/list.h> #include <linux/of_graph.h> #include <drm/drmP.h> +#include <drm/drm_bridge.h> #include <drm/drm_crtc.h> +#include <drm/drm_panel.h> #include <drm/drm_of.h> static void drm_release_of (struct device *dev,void *data)@@ -207,3 +209,51 @@ int drm_of_encoder_active_endpoint(struct device_node *node,return -EINVAL ; }
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 220
Quoted 10 lines
drivers/gpu/drm/drm_of.c +9
-0EXPORT_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 input 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.
Add a commend that at least one of panel, bridge must be set?
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 229
Quoted 8 lines
drivers/gpu/drm/drm_of.c +8
-0+* 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 = -ENODEV ;
This is only returned if !panel && !bridge. I'd consider this invalid usage of this function, so maybe use -EINVAL?
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 237
Quoted 8 lines
drivers/gpu/drm/drm_of.c +8
-0+struct device_node *remote; + + remote =of_graph_get_remote_node (np, port, endpoint); +if (!remote) +return -ENODEV ; + +if (bridge) + *bridge =NULL ;
I would move this ^ ...
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 241
Quoted 3 lines
drivers/gpu/drm/drm_of.c +3
-0+if (panel) { + *panel =of_drm_find_panel (remote); +if (*panel) {
... here.
Quoted 46 lines
drivers/gpu/drm/drm_of.c +18
-0+ ret =0 ; + goto out_put; + } + ret = -EPROBE_DEFER ; + } + +if (bridge) { + *bridge =of_drm_find_bridge (remote); +if (*bridge) + ret =0 ; +else + ret = -EPROBE_DEFER ; + } +out_put: +of_node_put (remote); +return ret; +} +EXPORT_SYMBOL_GPL (drm_of_find_panel_or_bridge);include/drm/drm_of.h +6
-0@@ -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 ; }
include/drm/drm_of.h static inline int drm_of_encoder_active_endpoint(struct device_node *node, · line 70
Quoted 10 lines
include/drm/drm_of.h +7
-0+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,
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
In reply to Rob HerringQuoted 35 lines · Rob Herring
Convert drivers to use the new
of_graph_get_remote_node()helper instead of parsing the endpoint node and then getting the remote device node. Now drivers can just specify the device node and which port/endpoint and get back the connected remote device node. The details of the graph binding are nicely abstracted into the core OF graph code.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/arm/hdlcd_drv.c | 22 ++------- drivers/gpu/drm/arm/malidp_drv.c | 29 ++--------- drivers/gpu/drm/bridge/adv7511/adv7533.c | 12 +---- drivers/gpu/drm/bridge/dumb-vga-dac.c | 15 ++---- drivers/gpu/drm/bridge/ti-tfp410.c | 15 ++---- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 16 +----- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 ++--- drivers/gpu/drm/exynos/exynos_drm_mic.c | 27 +--------- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 26 ++-------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 30 +---------- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 ++-------- drivers/gpu/drm/meson/meson_drv.c | 12 ++--- drivers/gpu/drm/meson/meson_venc_cvbs.c | 19 ++----- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +---------- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 18 +++---- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 11 +---- drivers/gpu/drm/tilcdc/tilcdc_external.c | 66 +++---------------------- drivers/gpu/drm/vc4/vc4_dpi.c | 15 ++---- 20 files changed, 64 insertions(+), 351 deletions(-)
[...]
Quoted 15 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-1@@ -661,7 +661,7 @@ static int mtk_dpi_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct mtk_dpi *dpi;struct resource *mem; -struct device_node *ep, *bridge_node =NULL ; +struct device_node *bridge_node;int comp_id;int ret;@@ -706,15 +706,9 @@ static int mtk_dpi_probe(struct platform_device *pdev)return -EINVAL ;
drivers/gpu/drm/mediatek/mtk_dpi.c static int mtk_dpi_probe(struct platform_device *pdev) · line 709
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-7} - ep =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (ep) { - bridge_node =of_graph_get_remote_port_parent (ep); -of_node_put (ep); - } -if (!bridge_node) { -dev_err (dev,"Failed to find bridge node\n" ); + bridge_node =of_graph_get_remote_node (dev->of_node,0 ,0 );
Note that before this change, of_graph_get_next_endpoint would just choose the first port/endpoint without restrictions to their reg properties, whereas the new code requires reg to be either not set or set to zero.
As the former is the case for the mt8173 dpi->hdmi link, which is the only use of this driver, this should be fine.
[...]
Quoted 32 lines
drivers/gpu/drm/mediatek/mtk_hdmi.c +3
-13@@ -1433,7 +1433,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, {struct device *dev = &pdev->dev;struct device_node *np = dev->of_node; -struct device_node *cec_np, *port, *ep, *remote, *i2c_np; +struct device_node *cec_np, *remote, *i2c_np;struct platform_device *cec_pdev;struct regmap *regmap;struct resource *mem;@@ -1485,29 +1485,9 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,if (IS_ERR (hdmi->regs))return PTR_ERR (hdmi->regs); - port =of_graph_get_port_by_id (np,1 ); -if (!port) { -dev_err (dev,"Missing output port node\n" ); + remote =of_graph_get_remote_node (np,1 ,0 ); +if (!remote)return -EINVAL ; - } - - ep =of_get_child_by_name (port,"endpoint" ); -if (!ep) { -dev_err (dev,"Missing endpoint node in port %s\n" , - port->full_name); -of_node_put (port); -return -EINVAL ; - }
drivers/gpu/drm/mediatek/mtk_hdmi.c static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, · line 1510
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_hdmi.c +0
-10-of_node_put (port); - - remote =of_graph_get_remote_port_parent (ep); -if (!remote) { -dev_err (dev,"Missing connector/bridge node for endpoint %s\n" , - ep->full_name); -of_node_put (ep); -return -EINVAL ; - } -of_node_put (ep);
Same as above. TMDS links reasonably have only one endpoint in the source port, and the mt8173-evb DT has no reg property set.
for the mediatek changes.
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Philipp Zabel
maintainerRe: [PATCH 4/5] drm: convert drivers to use drm_of_find_panel_or_bridge
In reply to Rob HerringQuoted 26 lines · Rob Herring
Similar to the previous commit, convert drivers open coding OF graph parsing to use
drm_of_find_panel_or_bridgeinstead.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 64 ++++------------- drivers/gpu/drm/bridge/nxp-ptn3460.c | 16 ++--- drivers/gpu/drm/bridge/parade-ps8622.c | 16 ++--- drivers/gpu/drm/bridge/tc358767.c | 27 +------ drivers/gpu/drm/exynos/exynos_dp.c | 35 ++++----- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 49 ++++--------- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 5 +- drivers/gpu/drm/imx/imx-ldb.c | 28 ++------ drivers/gpu/drm/imx/parallel-display.c | 35 ++------- drivers/gpu/drm/mediatek/mtk_dsi.c | 23 ++---- drivers/gpu/drm/mxsfb/mxsfb_out.c | 36 ++-------- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 26 ++----- drivers/gpu/drm/sun4i/sun4i_rgb.c | 17 ++--- drivers/gpu/drm/sun4i/sun4i_tcon.c | 90 ++---------------------- 14 files changed, 88 insertions(+), 379 deletions(-)
[...]
Quoted 29 lines
drivers/gpu/drm/imx/imx-ldb.c +1
-13@@ -649,7 +649,7 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)for_each_child_of_node (np, child) {struct imx_ldb_channel *channel; -struct device_node *ep; +struct device_node *remote;int bus_format; ret =of_property_read_u32 (child,"reg" , &i);@@ -673,27 +673,11 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)* The output port is port@4 with an external 4-port mux or * port@2 with the internal 2-port mux. */ - ep =of_graph_get_endpoint_by_regs (child, - imx_ldb->lvds_mux ?4 :2 , --1 ); -if (ep) { -struct device_node *remote; - - remote =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (remote) { - channel->panel =of_drm_find_panel (remote); - channel->bridge =of_drm_find_bridge (remote); - }else
drivers/gpu/drm/imx/imx-ldb.c static int imx_ldb_bind(struct device *dev, struct device *master, void *data) · line 676
Quoted 10 lines
drivers/gpu/drm/imx/imx-ldb.c +1
-9-return -EPROBE_DEFER ; -of_node_put (remote); - -if (!channel->panel && !channel->bridge) { -dev_err (dev,"panel/bridge not found: %s\n" , - remote->full_name); -return -EPROBE_DEFER ; - } - } + ret = drm_of_find_panel_or_bridge(fsl_dev->np,
s/fsl_dev->np/child/
drivers/gpu/drm/imx/imx-ldb.c static int imx_ldb_bind(struct device *dev, struct device *master, void *data) · line 677
Quoted 1 line
drivers/gpu/drm/imx/imx-ldb.c +1
-0+ imx_ldb->lvds_mux ? 4 : 2, 0,
Same comment as for the mediatek changes, this now requires that the endpoints have no reg property set or reg = <0>. This is fine for LVDS links, and I am not aware of any device trees that set the reg propertiy in their LVDS output endpoints, so that should be fine.
Quoted 48 lines
drivers/gpu/drm/imx/imx-ldb.c +3
-0+ &channel->panel, &channel->bridge); +if (ret) +return ret;/* panel ddc only if there is no bridge */ if (!channel->bridge) {drivers/gpu/drm/imx/parallel-display.c +1
-26@@ -210,7 +210,7 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) {struct drm_device *drm = data;struct device_node *np = dev->of_node; -struct device_node *ep; +struct device_node *remote;const u8 *edidp;struct imx_parallel_display *imxpd;int ret;@@ -239,36 +239,9 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) imxpd->bus_format = bus_format;/* port@1 is the output port */ - ep =of_graph_get_endpoint_by_regs (np,1 ,-1 ); -if (ep) { -struct device_node *remote; - - remote =of_graph_get_remote_port_parent (ep); -if (!remote) { -dev_warn (dev,"endpoint %s not connected\n" , - ep->full_name); -of_node_put (ep); -return -ENODEV ; - } -of_node_put (ep); - - imxpd->panel =of_drm_find_panel (remote); -if (imxpd->panel) { -dev_dbg (dev,"found panel %s\n" , remote->full_name); - }else { - imxpd->bridge =of_drm_find_bridge (remote); -if (imxpd->bridge) -dev_dbg (dev,"found bridge %s\n" , - remote->full_name); - } -if (!imxpd->panel && !imxpd->bridge) { -dev_dbg (dev,"waiting for panel or bridge %s\n" , - remote->full_name);
drivers/gpu/drm/imx/parallel-display.c static int imx_pd_bind(struct device *dev, struct device *master, void *data) · line 246
Quoted 10 lines
drivers/gpu/drm/imx/parallel-display.c +3
-5-of_node_put (remote); -return -EPROBE_DEFER ; - } -of_node_put (remote); - } + ret =drm_of_find_panel_or_bridge (np,1 ,0 , &imxpd->panel, &imxpd->bridge); +if (ret) +return ret; imxpd->dev = dev;
The parallel-display change looks good to me.
Quoted 39 lines
drivers/gpu/drm/mediatek/mtk_dsi.c +1
-12@@ -16,11 +16,11 @@#include <drm/drm_crtc_helper.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_panel.h> +#include <drm/drm_of.h> #include <linux/clk.h> #include <linux/component.h> #include <linux/of.h> #include <linux/of_platform.h> -#include <linux/of_graph.h> #include <linux/phy/phy.h> #include <linux/platform_device.h> #include <video/videomode.h> @@ -819,7 +819,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) {struct mtk_dsi *dsi;struct device *dev = &pdev->dev; -struct device_node *remote_node, *endpoint;struct resource *regs;int comp_id;int ret;@@ -831,22 +830,10 @@ static int mtk_dsi_probe(struct platform_device *pdev) dsi->host.ops = &mtk_dsi_ops; dsi->host.dev = dev; - endpoint =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (endpoint) { - remote_node =of_graph_get_remote_port_parent (endpoint); -if (!remote_node) { -dev_err (dev,"No panel connected\n" ); -return -ENODEV ; - } - - dsi->bridge =of_drm_find_bridge (remote_node); - dsi->panel =of_drm_find_panel (remote_node);
drivers/gpu/drm/mediatek/mtk_dsi.c static int mtk_dsi_probe(struct platform_device *pdev) · line 836
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dsi.c +4
-6-of_node_put (remote_node); -if (!dsi->bridge && !dsi->panel) { -dev_info (dev,"Waiting for bridge or panel driver\n" ); -return -EPROBE_DEFER ; - } - } + ret =drm_of_find_panel_or_bridge (dev->of_node,0 ,0 , + &dsi->panel, &dsi->bridge); +if (ret) +return ret;
Looks fine and also fixes a missing of_node_put on the endpoint node.
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Rob Herring
maintainerRe: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
In reply to Philipp ZabelQuoted 54 lines · Philipp Zabel
Quoted 35 lines · Rob Herring
Convert drivers to use the new
of_graph_get_remote_node()helper instead of parsing the endpoint node and then getting the remote device node. Now drivers can just specify the device node and which port/endpoint and get back the connected remote device node. The details of the graph binding are nicely abstracted into the core OF graph code.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/arm/hdlcd_drv.c | 22 ++------- drivers/gpu/drm/arm/malidp_drv.c | 29 ++--------- drivers/gpu/drm/bridge/adv7511/adv7533.c | 12 +---- drivers/gpu/drm/bridge/dumb-vga-dac.c | 15 ++---- drivers/gpu/drm/bridge/ti-tfp410.c | 15 ++---- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 16 +----- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 ++--- drivers/gpu/drm/exynos/exynos_drm_mic.c | 27 +--------- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 26 ++-------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 30 +---------- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 ++-------- drivers/gpu/drm/meson/meson_drv.c | 12 ++--- drivers/gpu/drm/meson/meson_venc_cvbs.c | 19 ++----- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +---------- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 18 +++---- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 11 +---- drivers/gpu/drm/tilcdc/tilcdc_external.c | 66 +++---------------------- drivers/gpu/drm/vc4/vc4_dpi.c | 15 ++---- 20 files changed, 64 insertions(+), 351 deletions(-)[...]
Quoted 17 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-1@@ -661,7 +661,7 @@ static int mtk_dpi_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct mtk_dpi *dpi;struct resource *mem; -struct device_node *ep, *bridge_node =NULL ; +struct device_node *bridge_node;int comp_id;int ret;@@ -706,15 +706,9 @@ static int mtk_dpi_probe(struct platform_device *pdev)return -EINVAL ; }
Quoted 15 lines
drivers/gpu/drm/mediatek/mtk_dpi.c static int mtk_dpi_probe(struct platform_device *pdev) · line 709
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-7- ep =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (ep) { - bridge_node =of_graph_get_remote_port_parent (ep); -of_node_put (ep); - } -if (!bridge_node) { -dev_err (dev,"Failed to find bridge node\n" ); + bridge_node =of_graph_get_remote_node (dev->of_node,0 ,0 );Note that before this change,
of_graph_get_next_endpointwould just choose the first port/endpoint without restrictions to their reg properties, whereas the new code requires reg to be either not set or set to zero.
As the former is the case for the mt8173dpi->hdmilink, which is the only use of this driver, this should be fine.
Yes, that is on purpose. A given node should have known port numbering and know what type of port each port is. The binding doc should outline the ports and endpoints.
Quoted 48 lines
[...]
Quoted 32 lines
drivers/gpu/drm/mediatek/mtk_hdmi.c +3
-13@@ -1433,7 +1433,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, {struct device *dev = &pdev->dev;struct device_node *np = dev->of_node; -struct device_node *cec_np, *port, *ep, *remote, *i2c_np; +struct device_node *cec_np, *remote, *i2c_np;struct platform_device *cec_pdev;struct regmap *regmap;struct resource *mem;@@ -1485,29 +1485,9 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,if (IS_ERR (hdmi->regs))return PTR_ERR (hdmi->regs); - port =of_graph_get_port_by_id (np,1 ); -if (!port) { -dev_err (dev,"Missing output port node\n" ); + remote =of_graph_get_remote_node (np,1 ,0 ); +if (!remote)return -EINVAL ; - } - - ep =of_get_child_by_name (port,"endpoint" ); -if (!ep) { -dev_err (dev,"Missing endpoint node in port %s\n" , - port->full_name); -of_node_put (port); -return -EINVAL ; - }drivers/gpu/drm/mediatek/mtk_hdmi.c static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, · line 1510
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_hdmi.c +0
-10-of_node_put (port); - - remote =of_graph_get_remote_port_parent (ep); -if (!remote) { -dev_err (dev,"Missing connector/bridge node for endpoint %s\n" , - ep->full_name); -of_node_put (ep); -return -EINVAL ; - } -of_node_put (ep);Same as above. TMDS links reasonably have only one endpoint in the source port, and the mt8173-evb DT has no reg property set.
Quoted 2 lines
Acked-by Philipp Zabel <[email protected]>for the mediatek changes.
Thanks.
Rob
Rob Herring
maintainerRe: [PATCH 1/5] of: introduce of_graph_get_remote_node
In reply to Daniel VetterQuoted 7 lines · Daniel Vetter
Quoted 6 lines · Rob Herring
The OF graph API leaves too much of the graph walking to clients when in many cases the driver doesn't care about accessing the port or endpoint nodes. The drivers typically just want the device connected via a particular graph connection.
of_graph_get_remote_nodeprovides this functionality.
Quoted 5 lines
Quoted 1 line
Signed-off-by Rob Herring <[email protected]>Just a quick procedural comment: drm-misc for 4.11 is closed already, but if we can get this core patch into 4.11 still then that would avoid cross-tree sync pains in 4.12 ...
Right, I was thinking the same thing.
Rob
Rob Herring
maintainerRe: [PATCH 1/5] of: introduce of_graph_get_remote_node
In reply to Philipp ZabelQuoted 30 lines · Philipp Zabel
Hi Rob,
thanks for this clean-up series! I was not aware how far the duplication has spread over time.
Quoted 17 lines · Rob Herring
The OF graph API leaves too much of the graph walking to clients when in many cases the driver doesn't care about accessing the port or endpoint nodes. The drivers typically just want the device connected via a particular graph connection.
of_graph_get_remote_nodeprovides this functionality.Signed-off-by Rob Herring <[email protected]>--- drivers/of/base.c | 28 ++++++++++++++++++++++++++++ include/linux/of_graph.h | 8 ++++++++ 2 files changed, 36 insertions(+)drivers/of/base.c +0
-0drivers/of/base.c struct device_node *of_graph_get_remote_port(const struct device_node *node) · line 2474
Quoted 6 lines
drivers/of/base.c +3
-0@@ -2469,3 +2469,31 @@ struct device_node *of_graph_get_remote_port(const struct device_node *node)return of_get_next_parent (np); }EXPORT_SYMBOL (of_graph_get_remote_port); + +struct device_node *of_graph_get_remote_node (const struct device_node *node, +int port,int endpoint)
Quoted 7 lines
I think this should have a documentation comment, similar to the
of_graph_get_endpoint_by_regsone, as it is not really clear from the function name that the returned device node is the parent (or grandparent) device node containing the remote port to the specified node & port & endpoint.
Also it might be interesting to the user that -1 is a wildcard value for port / endpoint.
I really want to not allow using a wildcard here. Drivers should know what port they want (or iterate over all of them). It didn't look like any drivers were depending on the wildcard, but were just using -1 for "no reg property" when really that should 0. Of course, I may have missed something.
I guess I could enforce port/endpoint > 0 here as there's no existing users.
Rob
Philipp Zabel
maintainerRe: [PATCH 1/5] of: introduce of_graph_get_remote_node
Quoted 39 lines · Rob Herring
Quoted 30 lines · Philipp Zabel
Hi Rob,
thanks for this clean-up series! I was not aware how far the duplication has spread over time.
Quoted 17 lines · Rob Herring
The OF graph API leaves too much of the graph walking to clients when in many cases the driver doesn't care about accessing the port or endpoint nodes. The drivers typically just want the device connected via a particular graph connection.
of_graph_get_remote_nodeprovides this functionality.Signed-off-by Rob Herring <[email protected]>--- drivers/of/base.c | 28 ++++++++++++++++++++++++++++ include/linux/of_graph.h | 8 ++++++++ 2 files changed, 36 insertions(+)drivers/of/base.c +0
-0drivers/of/base.c struct device_node *of_graph_get_remote_port(const struct device_node *node) · line 2474
Quoted 6 lines
drivers/of/base.c +3
-0@@ -2469,3 +2469,31 @@ struct device_node *of_graph_get_remote_port(const struct device_node *node)return of_get_next_parent (np); }EXPORT_SYMBOL (of_graph_get_remote_port); + +struct device_node *of_graph_get_remote_node (const struct device_node *node, +int port,int endpoint)Quoted 7 lines
I think this should have a documentation comment, similar to the
of_graph_get_endpoint_by_regsone, as it is not really clear from the function name that the returned device node is the parent (or grandparent) device node containing the remote port to the specified node & port & endpoint.
Also it might be interesting to the user that -1 is a wildcard value for port / endpoint.
Quoted 7 lines
I really want to not allow using a wildcard here. Drivers should know what port they want (or iterate over all of them). It didn't look like any drivers were depending on the wildcard, but were just using -1 for "no reg property" when really that should 0. Of course, I may have missed something.
I guess I could enforce port/endpoint > 0 here as there's no existing users.
That sounds reasonable. If it works for all users, enforcing >= 0 should be fine, but in that case I'd change the parameters to be unsigned.
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Rob Herring
maintainerRe: [PATCH 2/5] drm: of: introduce drm_of_find_panel_or_bridge
In reply to Liviu DudauQuoted 45 lines · Liviu Dudau
Quoted 44 lines · Rob Herring
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 <[email protected]>--- drivers/gpu/drm/drm_of.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_of.h | 13 +++++++++++++ 2 files changed, 63 insertions(+)drivers/gpu/drm/drm_of.c +15
-0@@ -3,7 +3,9 @@#include <linux/list.h> #include <linux/of_graph.h> #include <drm/drmP.h> +#include <drm/drm_bridge.h> #include <drm/drm_crtc.h> +#include <drm/drm_panel.h> #include <drm/drm_of.h> static void drm_release_of (struct device *dev,void *data)@@ -207,3 +209,51 @@ 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 input 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. +* +* 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,
Quoted 8 lines
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 229
Quoted 5 lines
drivers/gpu/drm/drm_of.c +5
-0+ int port, int endpoint, + struct drm_panel **panel, + struct drm_bridge **bridge) +{ + int ret = -ENODEV;Given that you never return 'ret' with
-ENODEVcan I suggest that you initialise 'ret' with -EPROBE_DEFER and then you can get rid of the two assignments further down?
But I can if both panel and bridge are NULL. I'm going with Philipp's suggestion of -EINVAL here.
Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Rob Herring
maintainerRe: [PATCH 2/5] drm: of: introduce drm_of_find_panel_or_bridge
In reply to Philipp ZabelQuoted 7 lines · Philipp Zabel
Quoted 6 lines · Rob Herring
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.
[...]
Quoted 9 lines
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 229
Quoted 6 lines
drivers/gpu/drm/drm_of.c +6
-0+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 = -ENODEV ;This is only returned if !panel && !bridge. I'd consider this invalid usage of this function, so maybe use
-EINVAL?
Yes.
Quoted 11 lines
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 237
Quoted 8 lines
drivers/gpu/drm/drm_of.c +8
-0+struct device_node *remote; + + remote =of_graph_get_remote_node (np, port, endpoint); +if (!remote) +return -ENODEV ; + +if (bridge) + *bridge =NULL ;I would move this ^ ...
Quoted 5 lines
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 241
Quoted 3 lines
drivers/gpu/drm/drm_of.c +3
-0+if (panel) { + *panel =of_drm_find_panel (remote); +if (*panel) {... here.
Okay.
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/drm_of.c +9
-0+ ret =0 ; + goto out_put; + } + ret = -EPROBE_DEFER ; + } + +if (bridge) { + *bridge =of_drm_find_bridge (remote); +if (*bridge)
Quoted 8 lines
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 258
Quoted 8 lines
drivers/gpu/drm/drm_of.c +8
-0+ ret =0 ; + else + ret = -EPROBE_DEFER ; + } +out_put: +of_node_put (remote); +return ret; +}
I've ended up re-writing things a bit getting rid of the goto and the result looks like this:
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) {
if (bridge)
*bridge = NULL;
ret = 0;
}
}
/* No panel found yet, check for a bridge next. */
if (ret && bridge) {
*bridge = of_drm_find_bridge(remote);
if (*bridge)
ret = 0;
}
of_node_put(remote);
return ret;
}--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Rob Herring
maintainerRe: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
In reply to Liviu DudauQuoted 64 lines · Liviu Dudau
Quoted 63 lines · Rob Herring
Convert drivers to use the new
of_graph_get_remote_node()helper instead of parsing the endpoint node and then getting the remote device node. Now drivers can just specify the device node and which port/endpoint and get back the connected remote device node. The details of the graph binding are nicely abstracted into the core OF graph code.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/arm/hdlcd_drv.c | 22 ++------- drivers/gpu/drm/arm/malidp_drv.c | 29 ++--------- drivers/gpu/drm/bridge/adv7511/adv7533.c | 12 +---- drivers/gpu/drm/bridge/dumb-vga-dac.c | 15 ++---- drivers/gpu/drm/bridge/ti-tfp410.c | 15 ++---- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 16 +----- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 ++--- drivers/gpu/drm/exynos/exynos_drm_mic.c | 27 +--------- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 26 ++-------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 30 +---------- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 ++-------- drivers/gpu/drm/meson/meson_drv.c | 12 ++--- drivers/gpu/drm/meson/meson_venc_cvbs.c | 19 ++----- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +---------- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 18 +++---- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 11 +---- drivers/gpu/drm/tilcdc/tilcdc_external.c | 66 +++---------------------- drivers/gpu/drm/vc4/vc4_dpi.c | 15 ++---- 20 files changed, 64 insertions(+), 351 deletions(-)drivers/gpu/drm/arm/hdlcd_drv.c +3
-13@@ -430,29 +430,13 @@ static int compare_dev(struct device *dev, void *data)static int hdlcd_probe (struct platform_device *pdev) { -struct device_node *port, *ep; +struct device_node *port;struct component_match *match =NULL ; -if (!pdev->dev.of_node) -return -ENODEV ; -/* there is only one output port inside each device, find it */ - ep =of_graph_get_next_endpoint (pdev->dev.of_node,NULL ); -if (!ep) -return -ENODEV ; - -if (!of_device_is_available (ep)) { -of_node_put (ep); + port =of_graph_get_remote_node (pdev->dev.of_node,0 ,0 ); +if (!port)return -ENODEV ; - } - -/* add the remote encoder port as component */
Quoted 8 lines
drivers/gpu/drm/arm/hdlcd_drv.c static int compare_dev(struct device *dev, void *data) · line 454
Quoted 5 lines
drivers/gpu/drm/arm/hdlcd_drv.c +0
-5- port =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!port || !of_device_is_available (port)) { -of_node_put (port); -return -EAGAIN ;The HDLCD change looks reasonable except for this
-EAGAINbusiness. I'll have to test your changes on my setup to see how this affects having the encoder as a module.
What are you expecting to happen with -EAGAIN? This one was a bit of an oddball.
This condition would only change if you had an overlay. That's a use case that needs to be handled in a common way ('cause I don't want to clean-up every driver doing overlays in their own way latter). Just having "status" changing at runtime would have all sorts of implications in the kernel.
Quoted 29 lines
Quoted 29 lines
drivers/gpu/drm/arm/hdlcd_drv.c +0
-1- }drm_of_component_match_add (&pdev->dev, &match, compare_dev, port);of_node_put (port);drivers/gpu/drm/arm/malidp_drv.c +1
-7@@ -262,7 +262,6 @@ static int malidp_bind(struct device *dev) {struct resource *res;struct drm_device *drm; -struct device_node *ep;struct malidp_drm *malidp;struct malidp_hw_device *hwdev;struct platform_device *pdev =to_platform_device (dev);@@ -360,12 +359,7 @@ static int malidp_bind(struct device *dev) goto init_fail;/* Set the CRTC's port so that the encoder component can find it */ - ep =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (!ep) { - ret = -EINVAL ; - goto port_fail; - } - malidp->crtc.port =of_get_next_parent (ep); + malidp->crtc.port =of_graph_get_port_by_id (dev->of_node,0 );
Quoted 10 lines
drivers/gpu/drm/arm/malidp_drv.c static int malidp_bind(struct device *dev) · line 421
Quoted 7 lines
drivers/gpu/drm/arm/malidp_drv.c +0
-1ret =component_bind_all (dev, drm);if (ret) {@@ -418,9 +412,7 @@ static int malidp_bind(struct device *dev) irq_init_fail:component_unbind_all (dev, drm); bind_fail: -of_node_put (malidp->crtc.port);Why removing this line? AFAICT this is still needed, according to
of_graph_get_port_by_id()documentation.
Yes, you are right.
Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Liviu Dudau
maintainerRe: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
Quoted 74 lines · Rob Herring
Quoted 64 lines · Liviu Dudau
Quoted 63 lines · Rob Herring
Convert drivers to use the new
of_graph_get_remote_node()helper instead of parsing the endpoint node and then getting the remote device node. Now drivers can just specify the device node and which port/endpoint and get back the connected remote device node. The details of the graph binding are nicely abstracted into the core OF graph code.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/arm/hdlcd_drv.c | 22 ++------- drivers/gpu/drm/arm/malidp_drv.c | 29 ++--------- drivers/gpu/drm/bridge/adv7511/adv7533.c | 12 +---- drivers/gpu/drm/bridge/dumb-vga-dac.c | 15 ++---- drivers/gpu/drm/bridge/ti-tfp410.c | 15 ++---- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 16 +----- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 ++--- drivers/gpu/drm/exynos/exynos_drm_mic.c | 27 +--------- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 26 ++-------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 30 +---------- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 ++-------- drivers/gpu/drm/meson/meson_drv.c | 12 ++--- drivers/gpu/drm/meson/meson_venc_cvbs.c | 19 ++----- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +---------- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 18 +++---- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 11 +---- drivers/gpu/drm/tilcdc/tilcdc_external.c | 66 +++---------------------- drivers/gpu/drm/vc4/vc4_dpi.c | 15 ++---- 20 files changed, 64 insertions(+), 351 deletions(-)drivers/gpu/drm/arm/hdlcd_drv.c +3
-13@@ -430,29 +430,13 @@ static int compare_dev(struct device *dev, void *data)static int hdlcd_probe (struct platform_device *pdev) { -struct device_node *port, *ep; +struct device_node *port;struct component_match *match =NULL ; -if (!pdev->dev.of_node) -return -ENODEV ; -/* there is only one output port inside each device, find it */ - ep =of_graph_get_next_endpoint (pdev->dev.of_node,NULL ); -if (!ep) -return -ENODEV ; - -if (!of_device_is_available (ep)) { -of_node_put (ep); + port =of_graph_get_remote_node (pdev->dev.of_node,0 ,0 ); +if (!port)return -ENODEV ; - } - -/* add the remote encoder port as component */ Quoted 8 lines
drivers/gpu/drm/arm/hdlcd_drv.c static int compare_dev(struct device *dev, void *data) · line 454
Quoted 5 lines
drivers/gpu/drm/arm/hdlcd_drv.c +0
-5- port =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!port || !of_device_is_available (port)) { -of_node_put (port); -return -EAGAIN ;The HDLCD change looks reasonable except for this
-EAGAINbusiness. I'll have to test your changes on my setup to see how this affects having the encoder as a module.
Quoted 2 lines
What are you expecting to happen with
-EAGAIN? This one was a bit of an oddball.
When both the HDLCD and the TDA998x drivers are compiled as modules, the order in which they are inserted can be somewhat random (due to testing). It is at that time when you want the probe of HDLCD to be retried on the insmod-ing of the tda998x.ko rather than fail entirely.
Quoted 6 lines
This condition would only change if you had an overlay. That's a use case that needs to be handled in a common way ('cause I don't want to clean-up every driver doing overlays in their own way latter). Just having "status" changing at runtime would have all sorts of implications in the kernel.
Hmm, not sure what you mean here with overlays. Are you thinking that the remote port is initially disabled and then re-enabled by an overlay? That is not the only way of_device_is_available() can fail, see above regarding modules.
Best regards,
Liviu
Quoted 44 lines
Quoted 30 lines
Quoted 30 lines
drivers/gpu/drm/arm/hdlcd_drv.c +0
-1- }drm_of_component_match_add (&pdev->dev, &match, compare_dev, port);of_node_put (port);drivers/gpu/drm/arm/malidp_drv.c +1
-7@@ -262,7 +262,6 @@ static int malidp_bind(struct device *dev) {struct resource *res;struct drm_device *drm; -struct device_node *ep;struct malidp_drm *malidp;struct malidp_hw_device *hwdev;struct platform_device *pdev =to_platform_device (dev);@@ -360,12 +359,7 @@ static int malidp_bind(struct device *dev) goto init_fail;/* Set the CRTC's port so that the encoder component can find it */ - ep =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (!ep) { - ret = -EINVAL ; - goto port_fail; - } - malidp->crtc.port =of_get_next_parent (ep); + malidp->crtc.port =of_graph_get_port_by_id (dev->of_node,0 );Quoted 10 lines
drivers/gpu/drm/arm/malidp_drv.c static int malidp_bind(struct device *dev) · line 421
Quoted 7 lines
drivers/gpu/drm/arm/malidp_drv.c +0
-1ret =component_bind_all (dev, drm);if (ret) {@@ -418,9 +412,7 @@ static int malidp_bind(struct device *dev) irq_init_fail:component_unbind_all (dev, drm); bind_fail: -of_node_put (malidp->crtc.port);Why removing this line? AFAICT this is still needed, according to
of_graph_get_port_by_id()documentation.Yes, you are right.
Rob
Signature · 12 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.htmlRob Herring
maintainerRe: [PATCH 4/5] drm: convert drivers to use drm_of_find_panel_or_bridge
In reply to Maxime RipardQuoted 32 lines · Maxime Ripard
Hi Rob,
Quoted 10 lines · Rob Herring
Similar to the previous commit, convert drivers open coding OF graph parsing to use
drm_of_find_panel_or_bridgeinstead.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
Signed-off-by Rob Herring <[email protected]>---
[..]
Quoted 16 lines
drivers/gpu/drm/sun4i/sun4i_rgb.c +1
-0@@ -15,6 +15,7 @@#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include "sun4i_drv.h" @@ -217,12 +218,10 @@ int sun4i_rgb_init(struct drm_device *drm) rgb->drv = drv; encoder = &rgb->encoder;
Quoted 13 lines
drivers/gpu/drm/sun4i/sun4i_rgb.c int sun4i_rgb_init(struct drm_device *drm) · line 224
Quoted 10 lines
drivers/gpu/drm/sun4i/sun4i_rgb.c +4
-6- tcon->panel =sun4i_tcon_find_panel (tcon->dev->of_node); - encoder->bridge =sun4i_tcon_find_bridge (tcon->dev->of_node); -if (IS_ERR (tcon->panel) &&IS_ERR (encoder->bridge)) { -dev_info (drm->dev,"No panel or bridge found... RGB output disabled\n" ); -return 0 ; - } + ret =drm_of_find_panel_or_bridge (tcon->dev->of_node,1 ,0 , + &tcon->panel, &encoder->bridge); +if (ret) +return ret;It used to ignore the error if it couldn't find the bridge. This will break the probe.
Well, I got it half right. :) The probe does that, but this needs to too.
Quoted 92 lines
Quoted 75 lines
drivers/gpu/drm/sun4i/sun4i_rgb.c +2
-4drm_encoder_helper_add (&rgb->encoder, &sun4i_rgb_enc_helper_funcs);@@ -239,7 +238,7 @@ int sun4i_rgb_init(struct drm_device *drm)/* The RGB encoder can only work with the TCON channel 0 */ rgb->encoder.possible_crtcs =BIT (0 ); -if (!IS_ERR (tcon->panel)) { +if (tcon->panel) {drm_connector_helper_add (&rgb->connector, &sun4i_rgb_con_helper_funcs); ret = drm_connector_init(drm, &rgb->connector,@@ -260,7 +259,7 @@ int sun4i_rgb_init(struct drm_device *drm) } } -if (!IS_ERR (encoder->bridge)) { +if (encoder->bridge) { encoder->bridge->encoder = &rgb->encoder; ret =drm_bridge_attach (drm, encoder->bridge);@@ -268,8 +267,6 @@ int sun4i_rgb_init(struct drm_device *drm)dev_err (drm->dev,"Couldn't attach our bridge\n" ); goto err_cleanup_connector; } - }else { - encoder->bridge =NULL ; }return 0 ;drivers/gpu/drm/sun4i/sun4i_tcon.c +1
-24@@ -15,13 +15,12 @@#include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_modes.h> -#include <drm/drm_panel.h> +#include <drm/drm_of.h> #include <linux/component.h> #include <linux/ioport.h> #include <linux/of_address.h> #include <linux/of_device.h> -#include <linux/of_graph.h> #include <linux/of_irq.h> #include <linux/regmap.h> #include <linux/reset.h> @@ -405,74 +404,6 @@ static int sun4i_tcon_init_regmap(struct device *dev,return 0 ; } -struct drm_panel *sun4i_tcon_find_panel (struct device_node *node) -{ -struct device_node *port, *remote, *child; -struct device_node *end_node =NULL ; - -/* Inputs are listed first, then outputs */ - port =of_graph_get_port_by_id (node,1 ); - -/* -* Our first output is the RGB interface where the panel will -* be connected. -*/ -for_each_child_of_node (port, child) { -u32 reg; - -of_property_read_u32 (child,"reg" , ®); -if (reg ==0 ) - end_node = child; - } - -if (!end_node) { -DRM_DEBUG_DRIVER ("Missing panel endpoint\n" );drivers/gpu/drm/sun4i/sun4i_tcon.c static int sun4i_tcon_init_regmap(struct device *dev, · line 439
Quoted 10 lines
drivers/gpu/drm/sun4i/sun4i_tcon.c +0
-10-return ERR_PTR (-ENODEV ); - } - - remote =of_graph_get_remote_port_parent (end_node); -if (!remote) { -DRM_DEBUG_DRIVER ("Unable to parse remote node\n" ); -return ERR_PTR (-EINVAL ); - } - -return of_drm_find_panel (remote) ?:ERR_PTR (-EPROBE_DEFER );And the panel is only one of our endpoints, which is optional, while other endpoints are mandatory. This means that we might very well have an endpoint that is not a panel or a bridge. In this case, I think your function will return an error and will be treated as such, while it's really the expected behaviour.
Quoted 4 lines
I think it's better to leave this driver alone for now, it's not as trivial as it looks, and will require some testing to get things right. I'll try to get my head around how to use your new (very welcome) helpers.
Well, certainly it needs testing. But this is one of the easier examples because you are requesting a specific port/endpoint number. It's the drivers that just loop over all the endpoints that give me more problems.
Anyway, this is 4.12 material, so I'll make the fix above and want to leave this in for now.
Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
In reply to Liviu DudauQuoted 13 lines · Liviu Dudau
Quoted 12 lines · Rob Herring
Quoted 10 lines · Liviu Dudau
drivers/gpu/drm/arm/hdlcd_drv.c static int compare_dev(struct device *dev, void *data) · line 454
Quoted 6 lines · Rob Herring
drivers/gpu/drm/arm/hdlcd_drv.c +0
-6-/* add the remote encoder port as component */ - port =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!port || !of_device_is_available (port)) { -of_node_put (port); -return -EAGAIN ;The HDLCD change looks reasonable except for this
-EAGAINbusiness. I'll have to test your changes on my setup to see how this affects having the encoder as a module.
Quoted 5 lines
Quoted 2 lines
What are you expecting to happen with
-EAGAIN? This one was a bit of an oddball.When both the HDLCD and the TDA998x drivers are compiled as modules, the order in which they are inserted can be somewhat random (due to testing).
Not really "due to testing" but if you run a real distro, they tend to have a multi-threaded behaviour when loading kernel modules at boot.
Quoted 2 lines
It is at that time when you want the probe of HDLCD to be retried on the insmod-ing of the tda998x.ko rather than fail entirely.
-EAGAIN doesn't get you that, and in any case, solving that problem is exactly why the component API exists - so that DRM only comes up once all the necessary components are available.
-EAGAIN also doesn't get you that from inside a probe function - such an error will be reported in the kernel log, and no further action will be taken (the device driver probe will be failed, and not automatically retried.
The only case that we automatically retry is if a driver returns -EPROBE_DEFER. Everything else causes a probe failure.
Signature · 7 lines
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Rob Herring
maintainerRe: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
In reply to Liviu DudauQuoted 13 lines · Liviu Dudau
Quoted 12 lines · Rob Herring
Quoted 11 lines · Liviu Dudau
Quoted 10 lines · Rob Herring
Convert drivers to use the new
of_graph_get_remote_node()helper instead of parsing the endpoint node and then getting the remote device node. Now drivers can just specify the device node and which port/endpoint and get back the connected remote device node. The details of the graph binding are nicely abstracted into the core OF graph code.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
[...]
Quoted 25 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
- /* add the remote encoder port as component */
- port =of_graph_get_remote_port_parent(ep);
-of_node_put(ep);
- if (!port || !of_device_is_available(port)) {(quoted diff) +0
-2- of_node_put(port); - return -EAGAIN;Quoted 5 lines
Quoted 2 lines
The HDLCD change looks reasonable except for this
-EAGAINbusiness. I'll have to test your changes on my setup to see how this affects having the encoder as a module.What are you expecting to happen with
-EAGAIN? This one was a bit of an oddball.When both the HDLCD and the TDA998x drivers are compiled as modules, the order in which they are inserted can be somewhat random (due to testing). It is at that time when you want the probe of HDLCD to be retried on the insmod-ing of the tda998x.ko rather than fail entirely.
Quoted 6 lines
This condition would only change if you had an overlay. That's a use case that needs to be handled in a common way ('cause I don't want to clean-up every driver doing overlays in their own way latter). Just having "status" changing at runtime would have all sorts of implications in the kernel.
Quoted 3 lines
Hmm, not sure what you mean here with overlays. Are you thinking that the remote port is initially disabled and then re-enabled by an overlay? That is not the only way
of_device_is_available()can fail, see above regarding modules.
Russell pretty much answered most of this, but specifically for of_device_is_available, the only way of_device_is_available() can change is a DT change with "status" changing. The only way of_graph_get_remote_port_parent changes is also from a DT change.
Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/5] drm: of: introduce drm_of_find_panel_or_bridge
In reply to Rob HerringQuoted 54 lines · Rob Herring
Quoted 7 lines · Philipp Zabel
Quoted 6 lines · Rob Herring
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.[...]
Quoted 9 lines
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 229
Quoted 6 lines
drivers/gpu/drm/drm_of.c +6
-0+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 = -ENODEV ;This is only returned if !panel && !bridge. I'd consider this invalid usage of this function, so maybe use
-EINVAL?Yes.
Quoted 11 lines
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 237
Quoted 8 lines
drivers/gpu/drm/drm_of.c +8
-0+struct device_node *remote; + + remote =of_graph_get_remote_node (np, port, endpoint); +if (!remote) +return -ENODEV ; + +if (bridge) + *bridge =NULL ;I would move this ^ ...
Quoted 5 lines
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 241
Quoted 3 lines
drivers/gpu/drm/drm_of.c +3
-0+if (panel) { + *panel =of_drm_find_panel (remote); +if (*panel) {... here.
Okay.
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/drm_of.c +12
-0+ ret =0 ; + goto out_put; + } + ret = -EPROBE_DEFER ; + } + +if (bridge) { + *bridge =of_drm_find_bridge (remote); +if (*bridge) + ret =0 ; +else + ret = -EPROBE_DEFER ;
Quoted 8 lines
Quoted 5 lines
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 258
Quoted 5 lines
drivers/gpu/drm/drm_of.c +5
-0+ } +out_put: +of_node_put (remote); +return ret; +}I've ended up re-writing things a bit getting rid of the goto and the result looks like this:
Looks good to me.
Quoted 4 lines
int drm_of_find_panel_or_bridge(const struct
device_node*np,
int port, int endpoint, structdrm_panel**panel, structdrm_bridge**bridge)
Quoted 16 lines
{
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) {
if (bridge)
*bridge = NULL;With the goto out_put gone, I'm conflicted whether I find this clearer here, or ...
Quoted 10 lines
ret = 0;
}
}
/* No panel found yet, check for a bridge next. */
if (ret && bridge) {
*bridge = of_drm_find_bridge(remote);
if (*bridge)
ret = 0;
}... even down here:
if (bridge) {
if (ret) {
/* No panel found yet, check for a bridge next. */
*bridge = of_drm_find_bridge(remote)
if (*bridge)
ret = 0;
} else {
*bridge = NULL;
}
}That way bridge doesn't have to be checked twice and all the modification of *bridge is in the same block.
Quoted 4 lines
of_node_put(remote); return ret; }
Either way,
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Liviu Dudau
maintainerRe: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
In reply to Russell King - ARM LinuxQuoted 14 lines · Russell King - ARM Linux
Quoted 13 lines · Liviu Dudau
Quoted 12 lines · Rob Herring
Quoted 10 lines · Liviu Dudau
drivers/gpu/drm/arm/hdlcd_drv.c static int compare_dev(struct device *dev, void *data) · line 454
Quoted 6 lines · Rob Herring
drivers/gpu/drm/arm/hdlcd_drv.c +0
-6-/* add the remote encoder port as component */ - port =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!port || !of_device_is_available (port)) { -of_node_put (port); -return -EAGAIN ;The HDLCD change looks reasonable except for this
-EAGAINbusiness. I'll have to test your changes on my setup to see how this affects having the encoder as a module.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
What are you expecting to happen with
-EAGAIN? This one was a bit of an oddball.When both the HDLCD and the TDA998x drivers are compiled as modules, the order in which they are inserted can be somewhat random (due to testing).
Not really "due to testing" but if you run a real distro, they tend to have a multi-threaded behaviour when loading kernel modules at boot.
Yeah, a lot of times I'm using a toy "distribution" (buildroot) as it boots faster under ARM models than a "real" (read systemd-based) distro would.
Quoted 4 lines
Quoted 3 lines
It is at that time when you want the probe of HDLCD to be retried on the insmod-ing of the tda998x.ko rather than fail entirely.
Quoted 8 lines
-EAGAINdoesn't get you that, and in any case, solving that problem is exactly why the component API exists - so that DRM only comes up once all the necessary components are available.
-EAGAINalso doesn't get you that from inside a probe function - such an error will be reported in the kernel log, and no further action will be taken (the device driver probe will be failed, and not automatically retried.
I stand corrected on the behaviour of the driver then. That was the original intent, to generate a re-probe of the driver.
Quoted 3 lines
The only case that we automatically retry is if a driver returns -EPROBE_DEFER. Everything else causes a probe failure.
OK, I will fix the driver if Rob's patch still requires it.
Best regards,
Liviu
Quoted 5 lines
Signature · 4 lines
-- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.
Signature · 12 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.htmlRe: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
Quoted 1 line · Liviu Dudau
OK, I will fix the driver if Rob's patch still requires it.
I don't think you ever needed it. As Rob says, what you're testing won't ever change unless you're using overlays - it's certainly not dependent on the tda998x module being loaded or not, or even the tda998x driver being bound or not.
Signature · 7 lines
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/5] drm: convert drivers to use drm_of_find_panel_or_bridge
In reply to Rob HerringHi Rob,
Quoted 147 lines · Rob Herring
Quoted 32 lines · Maxime Ripard
Hi Rob,
Quoted 10 lines · Rob Herring
Similar to the previous commit, convert drivers open coding OF graph parsing to use
drm_of_find_panel_or_bridgeinstead.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
Signed-off-by Rob Herring <[email protected]>---
[..]
Quoted 16 lines
drivers/gpu/drm/sun4i/sun4i_rgb.c +1
-0@@ -15,6 +15,7 @@#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include "sun4i_drv.h" @@ -217,12 +218,10 @@ int sun4i_rgb_init(struct drm_device *drm) rgb->drv = drv; encoder = &rgb->encoder;Quoted 13 lines
drivers/gpu/drm/sun4i/sun4i_rgb.c int sun4i_rgb_init(struct drm_device *drm) · line 224
Quoted 10 lines
drivers/gpu/drm/sun4i/sun4i_rgb.c +4
-6- tcon->panel =sun4i_tcon_find_panel (tcon->dev->of_node); - encoder->bridge =sun4i_tcon_find_bridge (tcon->dev->of_node); -if (IS_ERR (tcon->panel) &&IS_ERR (encoder->bridge)) { -dev_info (drm->dev,"No panel or bridge found... RGB output disabled\n" ); -return 0 ; - } + ret =drm_of_find_panel_or_bridge (tcon->dev->of_node,1 ,0 , + &tcon->panel, &encoder->bridge); +if (ret) +return ret;It used to ignore the error if it couldn't find the bridge. This will break the probe.
Well, I got it half right. :) The probe does that, but this needs to too.
Quoted 92 lines
Quoted 75 lines
drivers/gpu/drm/sun4i/sun4i_rgb.c +2
-4drm_encoder_helper_add (&rgb->encoder, &sun4i_rgb_enc_helper_funcs);@@ -239,7 +238,7 @@ int sun4i_rgb_init(struct drm_device *drm)/* The RGB encoder can only work with the TCON channel 0 */ rgb->encoder.possible_crtcs =BIT (0 ); -if (!IS_ERR (tcon->panel)) { +if (tcon->panel) {drm_connector_helper_add (&rgb->connector, &sun4i_rgb_con_helper_funcs); ret = drm_connector_init(drm, &rgb->connector,@@ -260,7 +259,7 @@ int sun4i_rgb_init(struct drm_device *drm) } } -if (!IS_ERR (encoder->bridge)) { +if (encoder->bridge) { encoder->bridge->encoder = &rgb->encoder; ret =drm_bridge_attach (drm, encoder->bridge);@@ -268,8 +267,6 @@ int sun4i_rgb_init(struct drm_device *drm)dev_err (drm->dev,"Couldn't attach our bridge\n" ); goto err_cleanup_connector; } - }else { - encoder->bridge =NULL ; }return 0 ;drivers/gpu/drm/sun4i/sun4i_tcon.c +1
-24@@ -15,13 +15,12 @@#include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_modes.h> -#include <drm/drm_panel.h> +#include <drm/drm_of.h> #include <linux/component.h> #include <linux/ioport.h> #include <linux/of_address.h> #include <linux/of_device.h> -#include <linux/of_graph.h> #include <linux/of_irq.h> #include <linux/regmap.h> #include <linux/reset.h> @@ -405,74 +404,6 @@ static int sun4i_tcon_init_regmap(struct device *dev,return 0 ; } -struct drm_panel *sun4i_tcon_find_panel (struct device_node *node) -{ -struct device_node *port, *remote, *child; -struct device_node *end_node =NULL ; - -/* Inputs are listed first, then outputs */ - port =of_graph_get_port_by_id (node,1 ); - -/* -* Our first output is the RGB interface where the panel will -* be connected. -*/ -for_each_child_of_node (port, child) { -u32 reg; - -of_property_read_u32 (child,"reg" , ®); -if (reg ==0 ) - end_node = child; - } - -if (!end_node) { -DRM_DEBUG_DRIVER ("Missing panel endpoint\n" );drivers/gpu/drm/sun4i/sun4i_tcon.c static int sun4i_tcon_init_regmap(struct device *dev, · line 439
Quoted 10 lines
drivers/gpu/drm/sun4i/sun4i_tcon.c +0
-10-return ERR_PTR (-ENODEV ); - } - - remote =of_graph_get_remote_port_parent (end_node); -if (!remote) { -DRM_DEBUG_DRIVER ("Unable to parse remote node\n" ); -return ERR_PTR (-EINVAL ); - } - -return of_drm_find_panel (remote) ?:ERR_PTR (-EPROBE_DEFER );And the panel is only one of our endpoints, which is optional, while other endpoints are mandatory. This means that we might very well have an endpoint that is not a panel or a bridge. In this case, I think your function will return an error and will be treated as such, while it's really the expected behaviour.
Quoted 4 lines
I think it's better to leave this driver alone for now, it's not as trivial as it looks, and will require some testing to get things right. I'll try to get my head around how to use your new (very welcome) helpers.
Quoted 4 lines
Well, certainly it needs testing. But this is one of the easier examples because you are requesting a specific port/endpoint number. It's the drivers that just loop over all the endpoints that give me more problems.
Oh, right... I missed that you were giving the port and endpoint numbers..
Quoted 2 lines
Anyway, this is 4.12 material, so I'll make the fix above and want to leave this in for now.
Ok, I'll test it, thanks!
Maxime
Signature · 3 lines
Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
Re: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
In reply to Rob HerringHi Rob,
Quoted 11 lines · Rob Herring
Convert drivers to use the new
of_graph_get_remote_node()helper instead of parsing the endpoint node and then getting the remote device node. Now drivers can just specify the device node and which port/endpoint and get back the connected remote device node. The details of the graph binding are nicely abstracted into the core OF graph code.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
Quoted 4 lines
Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/arm/hdlcd_drv.c | 22 ++------- drivers/gpu/drm/arm/malidp_drv.c | 29 ++---------
For the HDLCD and Mali DP part you can also add:
Best regards,
Liviu
Quoted 813 lines
drivers/gpu/drm/bridge/adv7511/adv7533.c | 12 +---- drivers/gpu/drm/bridge/dumb-vga-dac.c | 15 ++---- drivers/gpu/drm/bridge/ti-tfp410.c | 15 ++---- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 16 +----- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 ++--- drivers/gpu/drm/exynos/exynos_drm_mic.c | 27 +--------- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 26 ++-------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 30 +---------- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 26 ++-------- drivers/gpu/drm/meson/meson_drv.c | 12 ++--- drivers/gpu/drm/meson/meson_venc_cvbs.c | 19 ++----- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +---------- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 18 +++---- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 11 +---- drivers/gpu/drm/tilcdc/tilcdc_external.c | 66 +++---------------------- drivers/gpu/drm/vc4/vc4_dpi.c | 15 ++---- 20 files changed, 64 insertions(+), 351 deletions(-)drivers/gpu/drm/arm/hdlcd_drv.c +3
-19@@ -430,29 +430,13 @@ static int compare_dev(struct device *dev, void *data)static int hdlcd_probe (struct platform_device *pdev) { -struct device_node *port, *ep; +struct device_node *port;struct component_match *match =NULL ; -if (!pdev->dev.of_node) -return -ENODEV ; -/* there is only one output port inside each device, find it */ - ep =of_graph_get_next_endpoint (pdev->dev.of_node,NULL ); -if (!ep) -return -ENODEV ; - -if (!of_device_is_available (ep)) { -of_node_put (ep); + port =of_graph_get_remote_node (pdev->dev.of_node,0 ,0 ); +if (!port)return -ENODEV ; - } - -/* add the remote encoder port as component */ - port =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!port || !of_device_is_available (port)) { -of_node_put (port); -return -EAGAIN ; - }drm_of_component_match_add (&pdev->dev, &match, compare_dev, port);of_node_put (port);drivers/gpu/drm/arm/malidp_drv.c +4
-25@@ -262,7 +262,6 @@ static int malidp_bind(struct device *dev) {struct resource *res;struct drm_device *drm; -struct device_node *ep;struct malidp_drm *malidp;struct malidp_hw_device *hwdev;struct platform_device *pdev =to_platform_device (dev);@@ -360,12 +359,7 @@ static int malidp_bind(struct device *dev) goto init_fail;/* Set the CRTC's port so that the encoder component can find it */ - ep =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (!ep) { - ret = -EINVAL ; - goto port_fail; - } - malidp->crtc.port =of_get_next_parent (ep); + malidp->crtc.port =of_graph_get_port_by_id (dev->of_node,0 ); ret =component_bind_all (dev, drm);if (ret) {@@ -418,9 +412,7 @@ static int malidp_bind(struct device *dev) irq_init_fail:component_unbind_all (dev, drm); bind_fail: -of_node_put (malidp->crtc.port); malidp->crtc.port =NULL ; -port_fail:malidp_fini (drm); init_fail: drm->dev_private =NULL ;@@ -478,29 +470,16 @@ static int malidp_compare_dev(struct device *dev, void *data)static int malidp_platform_probe (struct platform_device *pdev) { -struct device_node *port, *ep; +struct device_node *port;struct component_match *match =NULL ;if (!pdev->dev.of_node)return -ENODEV ;/* there is only one output port inside each device, find it */ - ep =of_graph_get_next_endpoint (pdev->dev.of_node,NULL ); -if (!ep) -return -ENODEV ; - -if (!of_device_is_available (ep)) { -of_node_put (ep); + port =of_graph_get_remote_node (pdev->dev.of_node,0 ,0 ); +if (!port)return -ENODEV ; - } - -/* add the remote encoder port as component */ - port =of_graph_get_remote_port_parent (ep); -of_node_put (ep); -if (!port || !of_device_is_available (port)) { -of_node_put (port); -return -EAGAIN ; - }drm_of_component_match_add (&pdev->dev, &match, malidp_compare_dev, port);drivers/gpu/drm/bridge/adv7511/adv7533.c +2
-10@@ -232,7 +232,6 @@ void adv7533_detach_dsi(struct adv7511 *adv)int adv7533_parse_dt (struct device_node *np,struct adv7511 *adv) {u32 num_lanes; -struct device_node *endpoint;of_property_read_u32 (np,"adi,dsi-lanes" , &num_lanes);@@ -241,17 +240,10 @@ int adv7533_parse_dt(struct device_node *np, struct adv7511 *adv) adv->num_dsi_lanes = num_lanes; - endpoint =of_graph_get_next_endpoint (np,NULL ); -if (!endpoint) + adv->host_node =of_graph_get_remote_node (np,0 ,0 ); +if (!adv->host_node)return -ENODEV ; - adv->host_node =of_graph_get_remote_port_parent (endpoint); -if (!adv->host_node) { -of_node_put (endpoint); -return -ENODEV ; - } - -of_node_put (endpoint);of_node_put (adv->host_node); adv->use_timing_gen = !of_property_read_bool(np,drivers/gpu/drm/bridge/dumb-vga-dac.c +3
-12@@ -154,21 +154,12 @@ static const struct drm_bridge_funcs dumb_vga_bridge_funcs = {static struct i2c_adapter *dumb_vga_retrieve_ddc (struct device *dev) { -struct device_node *end_node, *phandle, *remote; +struct device_node *phandle, *remote;struct i2c_adapter *ddc; - end_node =of_graph_get_endpoint_by_regs (dev->of_node,1 ,-1 ); -if (!end_node) { -dev_err (dev,"Missing connector endpoint\n" ); -return ERR_PTR (-ENODEV ); - } - - remote =of_graph_get_remote_port_parent (end_node); -of_node_put (end_node); -if (!remote) { -dev_err (dev,"Enable to parse remote node\n" ); + remote =of_graph_get_remote_node (dev->of_node,1 ,-1 ); +if (!remote)return ERR_PTR (-EINVAL ); - } phandle =of_parse_phandle (remote,"ddc-i2c-bus" ,0 );of_node_put (remote);drivers/gpu/drm/bridge/ti-tfp410.c +5
-10@@ -127,18 +127,13 @@ static const struct drm_bridge_funcs tfp410_bridge_funcs = {static int tfp410_get_connector_ddc (struct tfp410 *dvi) { -struct device_node *ep =NULL , *connector_node =NULL ; -struct device_node *ddc_phandle =NULL ; +struct device_node *connector_node, *ddc_phandle;int ret =0 ;/* port@1 is the connector node */ - ep =of_graph_get_endpoint_by_regs (dvi->dev->of_node,1 ,-1 ); -if (!ep) - goto fail; - - connector_node =of_graph_get_remote_port_parent (ep); + connector_node =of_graph_get_remote_node (dvi->dev->of_node,1 ,-1 );if (!connector_node) - goto fail; +return -ENODEV ; ddc_phandle =of_parse_phandle (connector_node,"ddc-i2c-bus" ,0 );if (!ddc_phandle)@@ -150,10 +145,10 @@ static int tfp410_get_connector_ddc(struct tfp410 *dvi)else ret = -EPROBE_DEFER ; +of_node_put (ddc_phandle); + fail: -of_node_put (ep);of_node_put (connector_node); -of_node_put (ddc_phandle);return ret; }drivers/gpu/drm/exynos/exynos_drm_dpi.c +1
-15@@ -164,27 +164,13 @@ enum { FIMD_PORT_WRB, }; -static struct device_node *exynos_dpi_of_find_panel_node (struct device *dev) -{ -struct device_node *np, *ep; - - ep =of_graph_get_endpoint_by_regs (dev->of_node,FIMD_PORT_RGB ,0 ); -if (!ep) -return NULL ; - - np =of_graph_get_remote_port_parent (ep); -of_node_put (ep); - -return np; -} -static int exynos_dpi_parse_dt (struct exynos_dpi *ctx) {struct device *dev = ctx->dev;struct device_node *dn = dev->of_node;struct device_node *np; - ctx->panel_node =exynos_dpi_of_find_panel_node (dev); + ctx->panel_node =of_graph_get_remote_node (dn,FIMD_PORT_RGB ,0 ); np =of_get_child_by_name (dn,"display-timings" );if (np) {drivers/gpu/drm/exynos/exynos_drm_dsi.c +3
-10@@ -1670,17 +1670,10 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)of_node_put (ep); - ep =of_graph_get_next_endpoint (node,NULL ); -if (!ep) { - ret = -EINVAL ; - goto end; - } + dsi->bridge_node =of_graph_get_remote_node (node,DSI_PORT_OUT ,0 ); +if (!dsi->bridge_node) +return -EINVAL ; - dsi->bridge_node =of_graph_get_remote_port_parent (ep); -if (!dsi->bridge_node) { - ret = -EINVAL ; - goto end; - } end:of_node_put (ep);drivers/gpu/drm/exynos/exynos_drm_mic.c +2
-25@@ -228,29 +228,6 @@ static void mic_set_reg_on(struct exynos_mic *mic, bool enable)writel (reg, mic->reg +MIC_OP ); } -static struct device_node *get_remote_node (struct device_node *from,int reg) -{ -struct device_node *endpoint =NULL , *remote_node =NULL ; - - endpoint =of_graph_get_endpoint_by_regs (from, reg,-1 ); -if (!endpoint) { -DRM_ERROR ("mic: Failed to find remote port from %s" , - from->full_name); - goto exit; - } - - remote_node =of_graph_get_remote_port_parent (endpoint); -if (!remote_node) { -DRM_ERROR ("mic: Failed to find remote port parent from %s" , - from->full_name); - goto exit; - } - -exit: -of_node_put (endpoint); -return remote_node; -} -static int parse_dt (struct exynos_mic *mic) {int ret =0 , i, j;@@ -262,7 +239,7 @@ static int parse_dt(struct exynos_mic *mic)* The first node must be for decon and the second one must be for dsi. */ for (i =0 , j =0 ; i <NUM_ENDPOINTS ; i++) { - remote_node =get_remote_node (mic->dev->of_node, i); + remote_node =of_graph_get_remote_node (mic->dev->of_node, i,0 );if (!remote_node) { ret = -EPIPE ; goto exit;@@ -279,7 +256,7 @@ static int parse_dt(struct exynos_mic *mic)break ;case ENDPOINT_DSI_NODE :/* panel node */ - remote_node =get_remote_node (remote_node,1 ); + remote_node =of_graph_get_remote_node (remote_node,1 ,0 );if (!remote_node) { ret = -EPIPE ; goto exit;drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +4
-22@@ -757,34 +757,16 @@ static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi) {struct dsi_hw_ctx *ctx = dsi->ctx;struct device_node *np = pdev->dev.of_node; -struct device_node *endpoint, *bridge_node; -struct drm_bridge *bridge; +struct device_node *bridge_node;struct resource *res;/* * Get the endpoint node. In our case, dsi has one output port1 * to which the external HDMI bridge is connected. */ - endpoint =of_graph_get_endpoint_by_regs (np,1 ,-1 ); -if (!endpoint) { -DRM_ERROR ("no valid endpoint node\n" ); -return -ENODEV ; - } -of_node_put (endpoint); - - bridge_node =of_graph_get_remote_port_parent (endpoint); -if (!bridge_node) { -DRM_ERROR ("no valid bridge node\n" ); -return -ENODEV ; - } -of_node_put (bridge_node); - - bridge =of_drm_find_bridge (bridge_node); -if (!bridge) { -DRM_INFO ("wait for external HDMI bridge driver.\n" ); -return -EPROBE_DEFER ; - } - dsi->bridge = bridge; + ret =drm_of_find_panel_or_bridge (np,NULL , &dsi->bridge); +if (ret) +return ret; ctx->pclk =devm_clk_get (&pdev->dev,"pclk" );if (IS_ERR (ctx->pclk)) {drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +1
-29@@ -247,34 +247,6 @@ static const struct component_master_ops kirin_drm_ops = { .unbind = kirin_drm_unbind, }; -static struct device_node *kirin_get_remote_node (struct device_node *np) -{ -struct device_node *endpoint, *remote; - -/* get the first endpoint, in our case only one remote node -* is connected to display controller. -*/ - endpoint =of_graph_get_next_endpoint (np,NULL ); -if (!endpoint) { -DRM_ERROR ("no valid endpoint node\n" ); -return ERR_PTR (-ENODEV ); - } - - remote =of_graph_get_remote_port_parent (endpoint); -of_node_put (endpoint); -if (!remote) { -DRM_ERROR ("no valid remote node\n" ); -return ERR_PTR (-ENODEV ); - } - -if (!of_device_is_available (remote)) { -DRM_ERROR ("not available for remote node\n" ); -return ERR_PTR (-ENODEV ); - } - -return remote; -} -static int kirin_drm_platform_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;@@ -288,7 +260,7 @@ static int kirin_drm_platform_probe(struct platform_device *pdev)return -EINVAL ; } - remote =kirin_get_remote_node (np); + remote =of_graph_get_remote_node (np,0 ,0 );if (IS_ERR (remote))return PTR_ERR (remote);drivers/gpu/drm/mediatek/mtk_dpi.c +3
-9@@ -661,7 +661,7 @@ static int mtk_dpi_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct mtk_dpi *dpi;struct resource *mem; -struct device_node *ep, *bridge_node =NULL ; +struct device_node *bridge_node;int comp_id;int ret;@@ -706,15 +706,9 @@ static int mtk_dpi_probe(struct platform_device *pdev)return -EINVAL ; } - ep =of_graph_get_next_endpoint (dev->of_node,NULL ); -if (ep) { - bridge_node =of_graph_get_remote_port_parent (ep); -of_node_put (ep); - } -if (!bridge_node) { -dev_err (dev,"Failed to find bridge node\n" ); + bridge_node =of_graph_get_remote_node (dev->of_node,0 ,0 ); +if (!bridge_node)return -ENODEV ; - }dev_info (dev,"Found bridge node: %s\n" , bridge_node->full_name);drivers/gpu/drm/mediatek/mtk_hdmi.c +3
-23@@ -1433,7 +1433,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, {struct device *dev = &pdev->dev;struct device_node *np = dev->of_node; -struct device_node *cec_np, *port, *ep, *remote, *i2c_np; +struct device_node *cec_np, *remote, *i2c_np;struct platform_device *cec_pdev;struct regmap *regmap;struct resource *mem;@@ -1485,29 +1485,9 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,if (IS_ERR (hdmi->regs))return PTR_ERR (hdmi->regs); - port =of_graph_get_port_by_id (np,1 ); -if (!port) { -dev_err (dev,"Missing output port node\n" ); + remote =of_graph_get_remote_node (np,1 ,0 ); +if (!remote)return -EINVAL ; - } - - ep =of_get_child_by_name (port,"endpoint" ); -if (!ep) { -dev_err (dev,"Missing endpoint node in port %s\n" , - port->full_name); -of_node_put (port); -return -EINVAL ; - } -of_node_put (port); - - remote =of_graph_get_remote_port_parent (ep); -if (!remote) { -dev_err (dev,"Missing connector/bridge node for endpoint %s\n" , - ep->full_name); -of_node_put (ep); -return -EINVAL ; - } -of_node_put (ep);if (!of_device_is_compatible (remote,"hdmi-connector" )) { hdmi->bridge.next =of_drm_find_bridge (remote);drivers/gpu/drm/meson/meson_drv.c +6
-6@@ -163,14 +163,14 @@ static struct drm_driver meson_driver = {static bool meson_vpu_has_available_connectors (struct device *dev) { -struct device_node *ep, *remote; +struct device_node *remote; +int i; -/* Parses each endpoint and check if remote exists */ -for_each_endpoint_of_node (dev->of_node, ep) { -/* If the endpoint node exists, consider it enabled */ - remote =of_graph_get_remote_port (ep); -if (remote) +for_each_of_graph_remote_node (dev->of_node, remote, i,2 ) { +if (remote) { +of_node_put (remote);return true; + } }return false;drivers/gpu/drm/meson/meson_venc_cvbs.c +4
-15@@ -217,25 +217,14 @@ static const struct drm_encoder_helper_funcsstatic bool meson_venc_cvbs_connector_is_available (struct meson_drm *priv) { -struct device_node *ep, *remote; +struct device_node *remote; -/* CVBS VDAC output is on the first port, first endpoint */ - ep =of_graph_get_endpoint_by_regs (priv->dev->of_node,0 ,0 ); -if (!ep) + remote =of_graph_get_remote_node (priv->dev->of_node,0 ,0 ); +if (!remote)return false; - -/* If the endpoint node exists, consider it enabled */ - remote =of_graph_get_remote_port (ep); -if (remote) { -of_node_put (ep); -return true; - } - -of_node_put (ep);of_node_put (remote); - -return false; +return true; }int meson_venc_cvbs_create (struct meson_drm *priv)drivers/gpu/drm/msm/dsi/dsi_host.c +1
-2@@ -1637,9 +1637,8 @@ static int dsi_host_parse_dt(struct msm_dsi_host *msm_host) }/* Get panel node from the output port's endpoint data */ - device_node =of_graph_get_remote_port_parent (endpoint); + device_node =of_graph_get_remote_node (np,1 ,0 );if (!device_node) { -dev_err (dev,"%s: no valid device\n" , __func__); ret = -ENODEV ; goto err; }drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +1
-27@@ -225,32 +225,6 @@ int mdp4_enable(struct mdp4_kms *mdp4_kms)return 0 ; } -static struct device_node *mdp4_detect_lcdc_panel (struct drm_device *dev) -{ -struct device_node *endpoint, *panel_node; -struct device_node *np = dev->dev->of_node; - -/* -* LVDS/LCDC is the first port described in the list of ports in the -* MDP4 DT node. -*/ - endpoint =of_graph_get_endpoint_by_regs (np,0 ,-1 ); -if (!endpoint) { -DBG ("no LVDS remote endpoint\n" ); -return NULL ; - } - - panel_node =of_graph_get_remote_port_parent (endpoint); -if (!panel_node) { -DBG ("no valid panel node in LVDS endpoint\n" ); -of_node_put (endpoint); -return NULL ; - } - -of_node_put (endpoint); - -return panel_node; -}static int mdp4_modeset_init_intf (struct mdp4_kms *mdp4_kms,int intf_type)@@ -270,7 +244,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,* bail out early if there is no panel node (no need to * initialize LCDC encoder and LVDS connector) */ - panel_node =mdp4_detect_lcdc_panel (dev); + panel_node =of_graph_get_remote_node (dev->dev->of_node,0 ,0 );if (!panel_node)return 0 ;drivers/gpu/drm/rockchip/rockchip_drm_drv.c +6
-12@@ -373,19 +373,13 @@ static void rockchip_add_endpoints(struct device *dev,struct component_match **match, struct device_node *port) { - struct device_node *ep, *remote; + struct device_node *remote; +int i; -for_each_child_of_node (port, ep) { - remote =of_graph_get_remote_port_parent (ep); -if (!remote || !of_device_is_available (remote)) { -of_node_put (remote); -continue ; - }else if (!of_device_is_available (remote->parent)) { -dev_warn (dev,"parent device of %s is not available\n" , - remote->full_name); -of_node_put (remote); +for (i =0 ; i <3 ; i++) { + remote =of_graph_get_remote_node (port,0 , i); +if (!remote)continue ; - }drm_of_component_match_add (dev, match, compare_of, remote);of_node_put (remote);@@ -464,7 +458,7 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev)continue ; } -rockchip_add_endpoints (dev, &match, port); +rockchip_add_endpoints (dev, &match, port->parent);of_node_put (port); }drivers/gpu/drm/tilcdc/tilcdc_crtc.c +1
-10@@ -1013,16 +1013,7 @@ int tilcdc_crtc_create(struct drm_device *dev)drm_crtc_helper_add (crtc, &tilcdc_crtc_helper_funcs);if (priv->is_componentized) { -struct device_node *ports = -of_get_child_by_name (dev->dev->of_node,"ports" ); - -if (ports) { - crtc->port =of_get_child_by_name (ports,"port" ); -of_node_put (ports); - }else { - crtc->port = -of_get_child_by_name (dev->dev->of_node,"port" ); - } + crtc->port =of_graph_get_port_by_id (dev->dev->of_node,0 ,0 );if (!crtc->port) {/* This should never happen */ dev_err (dev->dev,"Port node not found in %s\n" , dev->dev->of_node->full_name);drivers/gpu/drm/tilcdc/tilcdc_external.c +8
-58@@ -187,39 +187,6 @@ int tilcdc_attach_bridge(struct drm_device *ddev, struct drm_bridge *bridge)return ret; } -static int tilcdc_node_has_port (struct device_node *dev_node) -{ -struct device_node *node; - - node =of_get_child_by_name (dev_node,"ports" ); -if (!node) - node =of_get_child_by_name (dev_node,"port" ); -if (!node) -return 0 ; -of_node_put (node); - -return 1 ; -} - -static -struct device_node *tilcdc_get_remote_node (struct device_node *node) -{ -struct device_node *ep; -struct device_node *parent; - -if (!tilcdc_node_has_port (node)) -return NULL ; - - ep =of_graph_get_next_endpoint (node,NULL ); -if (!ep) -return NULL ; - - parent =of_graph_get_remote_port_parent (ep); -of_node_put (ep); - -return parent; -} -int tilcdc_attach_external_device (struct drm_device *ddev) {struct tilcdc_drm_private *priv = ddev->dev_private;@@ -227,7 +194,7 @@ int tilcdc_attach_external_device(struct drm_device *ddev)struct drm_bridge *bridge;int ret; - remote_node =tilcdc_get_remote_node (ddev->dev->of_node); + remote_node =of_graph_get_remote_node (ddev->dev->of_node,0 ,0 );if (!remote_node)return 0 ;@@ -266,35 +233,18 @@ int tilcdc_get_external_components(struct device *dev, struct component_match **match) {struct device_node *node; -struct device_node *ep =NULL ; -int count =0 ; -int ret =0 ; -if (!tilcdc_node_has_port (dev->of_node)) +if (!match)return 0 ; -while ((ep =of_graph_get_next_endpoint (dev->of_node, ep))) { - node =of_graph_get_remote_port_parent (ep); -if (!node || !of_device_is_available (node)) { -of_node_put (node); -continue ; - } - -dev_dbg (dev,"Subdevice node '%s' found\n" , node->name); - -if (of_device_is_compatible (node,"nxp,tda998x" )) { -if (match) -drm_of_component_match_add (dev, match, - dev_match_of, node); - ret =1 ; - } + node =of_graph_get_remote_node (dev->of_node,0 ,0 ); +if (!of_device_is_compatible (node,"nxp,tda998x" )) {of_node_put (node); -if (count++ >1 ) { -dev_err (dev,"Only one port is supported\n" ); -return -EINVAL ; - } +return 0 ; } -return ret; +drm_of_component_match_add (dev, match, dev_match_of, node); +of_node_put (node); +return 1 ; }drivers/gpu/drm/vc4/vc4_dpi.c +3
-12@@ -366,23 +366,14 @@ static const struct of_device_id vc4_dpi_dt_match[] = {*/ static struct drm_panel *vc4_dpi_get_panel (struct device *dev) { -struct device_node *endpoint, *panel_node; +struct device_node *panel_node;struct device_node *np = dev->of_node;struct drm_panel *panel; - endpoint =of_graph_get_next_endpoint (np,NULL ); -if (!endpoint) { -dev_err (dev,"no endpoint to fetch DPI panel\n" ); -return NULL ; - } -/* don't proceed if we have an endpoint but no panel_node tied to it */ - panel_node =of_graph_get_remote_port_parent (endpoint); -of_node_put (endpoint); -if (!panel_node) { -dev_err (dev,"no valid panel node\n" ); + panel_node =of_graph_get_remote_node (np,0 ,0 ); +if (!panel_node)return NULL ; - } panel =of_drm_find_panel (panel_node);of_node_put (panel_node);Signature · 1 line
2.10.1
Signature · 8 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯Re: [PATCH 3/5] drm: convert drivers to use of_graph_get_remote_node
In reply to Rob HerringQuoted 10 lines · Rob Herring
Convert drivers to use the new
of_graph_get_remote_node()helper instead of parsing the endpoint node and then getting the remote device node. Now drivers can just specify the device node and which port/endpoint and get back the connected remote device node. The details of the graph binding are nicely abstracted into the core OF graph code.This changes some error messages to debug messages (in the graph core). Graph connections are often "no connects" depending on the particular board, so we want to avoid spurious messages. Plus the kernel is not a DT validator.
For vc4,
Thanks for making this easier.
Re: [PATCH 2/5] drm: of: introduce drm_of_find_panel_or_bridge
In reply to Rob HerringQuoted 28 lines · Rob Herring
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 <[email protected]>--- drivers/gpu/drm/drm_of.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_of.h | 13 +++++++++++++ 2 files changed, 63 insertions(+)drivers/gpu/drm/drm_of.c +2
-0@@ -3,7 +3,9 @@#include <linux/list.h> #include <linux/of_graph.h> #include <drm/drmP.h> +#include <drm/drm_bridge.h> #include <drm/drm_crtc.h> +#include <drm/drm_panel.h> #include <drm/drm_of.h> static void drm_release_of (struct device *dev,void *data)
drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 215
Quoted 7 lines
drivers/gpu/drm/drm_of.c +4
-0@@ -207,3 +209,51 @@ 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 input ports
@port: ....
@endpoint: ....drivers/gpu/drm/drm_of.c int drm_of_encoder_active_endpoint(struct device_node *node, · line 228
Quoted 13 lines
drivers/gpu/drm/drm_of.c +13
-0+* @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. +* +* 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) +{
< snip >
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html