drm/rockchip: protect connector status with loader protect

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_of.c

diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c
index 493c05c9ce4f02a5eac0037f578989367bc151a7..fb758f26cf5cb83fc26c270afcac19f38e5fb507 100644 (file)
--- a/drivers/gpu/drm/drm_of.c
+++ b/drivers/gpu/drm/drm_of.c
@@ -48,6 +48,11 @@ uint32_t drm_of_find_possible_crtcs(struct drm_device *dev,
        uint32_t possible_crtcs = 0;
 
        for_each_endpoint_of_node(port, ep) {
+               if (!of_device_is_available(ep)) {
+                       of_node_put(ep);
+                       continue;
+               }
+
                remote_port = of_graph_get_remote_port(ep);
                if (!remote_port) {
                        of_node_put(ep);
@@ -149,3 +154,37 @@ int drm_of_component_probe(struct device *dev,
        return component_master_add_with_match(dev, m_ops, match);
 }
 EXPORT_SYMBOL(drm_of_component_probe);
+
+/*
+ * drm_of_encoder_active_endpoint - return the active encoder endpoint
+ * @node: device tree node containing encoder input ports
+ * @encoder: drm_encoder
+ *
+ * Given an encoder device node and a drm_encoder with a connected crtc,
+ * parse the encoder endpoint connecting to the crtc port.
+ */
+int drm_of_encoder_active_endpoint(struct device_node *node,
+                                  struct drm_encoder *encoder,
+                                  struct of_endpoint *endpoint)
+{
+       struct device_node *ep;
+       struct drm_crtc *crtc = encoder->crtc;
+       struct device_node *port;
+       int ret;
+
+       if (!node || !crtc)
+               return -EINVAL;
+
+       for_each_endpoint_of_node(node, ep) {
+               port = of_graph_get_remote_port(ep);
+               of_node_put(port);
+               if (port == crtc->port) {
+                       ret = of_graph_parse_endpoint(ep, endpoint);
+                       of_node_put(ep);
+                       return ret;
+               }
+       }
+
+       return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint);