drm: of: introduce drm_of_find_panel_or_bridge

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>
[seanpaul dropped extern from drm_of.h]
Signed-off-by: Sean Paul <seanpaul@chromium.org>

diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c
index b5f2f0fece99887a6467058f8a2e18b87fdbe58a..2120f33bdf4a4f21d9fc7d89577818193f30020e 100644 (file)
--- a/drivers/gpu/drm/drm_of.c
+++ b/drivers/gpu/drm/drm_of.c
@@ -3,8 +3,10 @@
 #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_encoder.h>
+#include <drm/drm_panel.h>
 #include <drm/drm_of.h>
 
 static void drm_release_of(struct device *dev, void *data)
@@ -208,3 +210,53 @@ int drm_of_encoder_active_endpoint(struct device_node *node,
        return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint);
+
+/*
+ * drm_of_find_panel_or_bridge - return connected panel or bridge device
+ * @np: device tree node containing encoder output ports
+ * @panel: pointer to hold returned drm_panel
+ * @bridge: pointer to hold returned drm_bridge
+ *
+ * Given a DT node's port and endpoint number, find the connected node and
+ * return either the associated struct drm_panel or drm_bridge device. Either
+ * @panel or @bridge must not be NULL.
+ *
+ * Returns zero if successful, or one of the standard error codes if it fails.
+ */
+int drm_of_find_panel_or_bridge(const struct device_node *np,
+                               int port, int endpoint,
+                               struct drm_panel **panel,
+                               struct drm_bridge **bridge)
+{
+       int ret = -EPROBE_DEFER;
+       struct device_node *remote;
+
+       if (!panel && !bridge)
+               return -EINVAL;
+
+       remote = of_graph_get_remote_node(np, port, endpoint);
+       if (!remote)
+               return -ENODEV;
+
+       if (panel) {
+               *panel = of_drm_find_panel(remote);
+               if (*panel)
+                       ret = 0;
+       }
+
+       /* No panel found yet, check for a bridge next. */
+       if (bridge) {
+               if (ret) {
+                       *bridge = of_drm_find_bridge(remote);
+                       if (*bridge)
+                               ret = 0;
+               } else {
+                       *bridge = NULL;
+               }
+
+       }
+
+       of_node_put(remote);
+       return ret;
+}
+EXPORT_SYMBOL_GPL(drm_of_find_panel_or_bridge);

diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h
index d1fc563f068a556a8ddce2443c10ba1f1d3d55c9..104dd517fdbe032d4f0f5a87e96b64efbfe4b6b5 100644 (file)
--- 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 @@ int drm_of_component_probe(struct device *dev,
 int drm_of_encoder_active_endpoint(struct device_node *node,
                                   struct drm_encoder *encoder,
                                   struct of_endpoint *endpoint);
+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,