| Message ID | 20170209190558.4784-4-robh@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/10/2017 12:35 AM, Rob Herring wrote: > 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 <robh@kernel.org> > Acked-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > v2: > - Reworked code flow > - Added note that at least one of panel or bridge must not be NULL. > > drivers/gpu/drm/drm_of.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ > include/drm/drm_of.h | 13 ++++++++++++ > 2 files changed, 65 insertions(+) > > diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c > index 47848ed8ca48..86b8b959587a 100644 > --- a/drivers/gpu/drm/drm_of.c > +++ b/drivers/gpu/drm/drm_of.c > @@ -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,53 @@ int drm_of_encoder_active_endpoint(struct device_node *node, > return -EINVAL; > } > EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint); > + > +/* > + * drm_of_find_panel_or_bridge - return connected panel or bridge device > + * @np: device tree node containing encoder input ports Should this be 'encoder output ports'? It's the encoder's output port(s) that contain the endpoint corresponding to the bridge/panel input port. Thanks, Archit > + * @panel: pointer to hold returned drm_panel > + * @bridge: pointer to hold returned drm_bridge > + * > + * Given a DT node's port and endpoint number, find the connected node and > + * return either the associated struct drm_panel or drm_bridge device. Either > + * @panel or @bridge must not be NULL. > + * > + * Returns zero if successful, or one of the standard error codes if it fails. > + */ > +int drm_of_find_panel_or_bridge(const struct device_node *np, > + int port, int endpoint, > + struct drm_panel **panel, > + struct drm_bridge **bridge) > +{ > + int ret = -EPROBE_DEFER; > + struct device_node *remote; > + > + if (!panel && !bridge) > + return -EINVAL; > + > + remote = of_graph_get_remote_node(np, port, endpoint); > + if (!remote) > + return -ENODEV; > + > + if (panel) { > + *panel = of_drm_find_panel(remote); > + if (*panel) > + ret = 0; > + } > + > + /* No panel found yet, check for a bridge next. */ > + if (bridge) { > + if (ret) { > + *bridge = of_drm_find_bridge(remote); > + if (*bridge) > + ret = 0; > + } else { > + *bridge = NULL; > + } > + > + } > + > + of_node_put(remote); > + return ret; > +} > +EXPORT_SYMBOL_GPL(drm_of_find_panel_or_bridge); > diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h > index 26a64805cc15..f86507f0599b 100644 > --- a/include/drm/drm_of.h > +++ b/include/drm/drm_of.h > @@ -8,6 +8,8 @@ struct component_match; > struct device; > struct drm_device; > struct drm_encoder; > +struct drm_panel; > +struct drm_bridge; > struct device_node; > > #ifdef CONFIG_OF > @@ -23,6 +25,10 @@ extern int drm_of_component_probe(struct device *dev, > extern int drm_of_encoder_active_endpoint(struct device_node *node, > struct drm_encoder *encoder, > struct of_endpoint *endpoint); > +extern int drm_of_find_panel_or_bridge(const struct device_node *np, > + int port, int endpoint, > + struct drm_panel **panel, > + struct drm_bridge **bridge); > #else > static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, > struct device_node *port) > @@ -52,6 +58,13 @@ static inline int drm_of_encoder_active_endpoint(struct device_node *node, > { > return -EINVAL; > } > +static inline int drm_of_find_panel_or_bridge(const struct device_node *np, > + int port, int endpoint, > + struct drm_panel **panel, > + struct drm_bridge **bridge) > +{ > + return -EINVAL; > +} > #endif > > static inline int drm_of_encoder_active_endpoint_id(struct device_node *node, > -- > 2.10.1 >
On Sun, Feb 12, 2017 at 10:47 PM, Archit Taneja <architt@codeaurora.org> wrote: > > > On 02/10/2017 12:35 AM, Rob Herring wrote: >> >> 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 <robh@kernel.org> >> Acked-by: Philipp Zabel <p.zabel@pengutronix.de> >> --- >> v2: >> - Reworked code flow >> - Added note that at least one of panel or bridge must not be NULL. >> >> drivers/gpu/drm/drm_of.c | 52 >> ++++++++++++++++++++++++++++++++++++++++++++++++ >> include/drm/drm_of.h | 13 ++++++++++++ >> 2 files changed, 65 insertions(+) >> >> diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c >> index 47848ed8ca48..86b8b959587a 100644 >> --- a/drivers/gpu/drm/drm_of.c >> +++ b/drivers/gpu/drm/drm_of.c >> @@ -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,53 @@ int drm_of_encoder_active_endpoint(struct device_node >> *node, >> return -EINVAL; >> } >> EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint); >> + >> +/* >> + * drm_of_find_panel_or_bridge - return connected panel or bridge device >> + * @np: device tree node containing encoder input ports > > > Should this be 'encoder output ports'? It's the encoder's output port(s) > that > contain the endpoint corresponding to the bridge/panel input port. Yes, indeed. Rob
diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index 47848ed8ca48..86b8b959587a 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -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,53 @@ int drm_of_encoder_active_endpoint(struct device_node *node, return -EINVAL; } EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint); + +/* + * drm_of_find_panel_or_bridge - return connected panel or bridge device + * @np: device tree node containing encoder 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. Either + * @panel or @bridge must not be NULL. + * + * Returns zero if successful, or one of the standard error codes if it fails. + */ +int drm_of_find_panel_or_bridge(const struct device_node *np, + int port, int endpoint, + struct drm_panel **panel, + struct drm_bridge **bridge) +{ + int ret = -EPROBE_DEFER; + struct device_node *remote; + + if (!panel && !bridge) + return -EINVAL; + + remote = of_graph_get_remote_node(np, port, endpoint); + if (!remote) + return -ENODEV; + + if (panel) { + *panel = of_drm_find_panel(remote); + if (*panel) + ret = 0; + } + + /* No panel found yet, check for a bridge next. */ + if (bridge) { + if (ret) { + *bridge = of_drm_find_bridge(remote); + if (*bridge) + ret = 0; + } else { + *bridge = NULL; + } + + } + + of_node_put(remote); + return ret; +} +EXPORT_SYMBOL_GPL(drm_of_find_panel_or_bridge); diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index 26a64805cc15..f86507f0599b 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -8,6 +8,8 @@ struct component_match; struct device; struct drm_device; struct drm_encoder; +struct drm_panel; +struct drm_bridge; struct device_node; #ifdef CONFIG_OF @@ -23,6 +25,10 @@ extern int drm_of_component_probe(struct device *dev, extern int drm_of_encoder_active_endpoint(struct device_node *node, struct drm_encoder *encoder, struct of_endpoint *endpoint); +extern int drm_of_find_panel_or_bridge(const struct device_node *np, + int port, int endpoint, + struct drm_panel **panel, + struct drm_bridge **bridge); #else static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, struct device_node *port) @@ -52,6 +58,13 @@ static inline int drm_of_encoder_active_endpoint(struct device_node *node, { return -EINVAL; } +static inline int drm_of_find_panel_or_bridge(const struct device_node *np, + int port, int endpoint, + struct drm_panel **panel, + struct drm_bridge **bridge) +{ + return -EINVAL; +} #endif static inline int drm_of_encoder_active_endpoint_id(struct device_node *node,