drm/sun4i: DW HDMI: Expand algorithm for possible crtcs
authorJernej Skrabec <jernej.skrabec@siol.net>
Mon, 25 Jun 2018 12:03:02 +0000 (14:03 +0200)
committerMaxime Ripard <maxime.ripard@bootlin.com>
Wed, 27 Jun 2018 19:44:05 +0000 (21:44 +0200)
drm_of_find_possible_crtcs() doesn't work when DW HDMI encoder is
connected to TCON (crtc) through mux in TCON TOP.

In that case TCON TOP HDMI mux input port has to be manually traversed
and checked if it matches any known crtc.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180625120304.7543-23-jernej.skrabec@siol.net
drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c

index 9f40a44b456b209b8c35631486631624d6502d7e..3459b9ec56c9b6e6a74464fd64eb4e3d8ff759fb 100644 (file)
@@ -12,6 +12,7 @@
 #include <drm/drm_crtc_helper.h>
 
 #include "sun8i_dw_hdmi.h"
+#include "sun8i_tcon_top.h"
 
 static void sun8i_dw_hdmi_encoder_mode_set(struct drm_encoder *encoder,
                                           struct drm_display_mode *mode,
@@ -41,6 +42,48 @@ sun8i_dw_hdmi_mode_valid(struct drm_connector *connector,
        return MODE_OK;
 }
 
+static bool sun8i_dw_hdmi_node_is_tcon_top(struct device_node *node)
+{
+       return !!of_match_node(sun8i_tcon_top_of_table, node);
+}
+
+static u32 sun8i_dw_hdmi_find_possible_crtcs(struct drm_device *drm,
+                                            struct device_node *node)
+{
+       struct device_node *port, *ep, *remote, *remote_port;
+       u32 crtcs = 0;
+
+       port = of_graph_get_port_by_id(node, 0);
+       if (!port)
+               return 0;
+
+       ep = of_get_next_available_child(port, NULL);
+       if (!ep)
+               return 0;
+
+       remote = of_graph_get_remote_port_parent(ep);
+       if (!remote)
+               return 0;
+
+       if (sun8i_dw_hdmi_node_is_tcon_top(remote)) {
+               port = of_graph_get_port_by_id(remote, 4);
+               if (!port)
+                       return 0;
+
+               for_each_child_of_node(port, ep) {
+                       remote_port = of_graph_get_remote_port(ep);
+                       if (remote_port) {
+                               crtcs |= drm_of_crtc_port_mask(drm, remote_port);
+                               of_node_put(remote_port);
+                       }
+               }
+       } else {
+               crtcs = drm_of_find_possible_crtcs(drm, node);
+       }
+
+       return crtcs;
+}
+
 static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
                              void *data)
 {
@@ -63,7 +106,8 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
        hdmi->dev = &pdev->dev;
        encoder = &hdmi->encoder;
 
-       encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);
+       encoder->possible_crtcs =
+               sun8i_dw_hdmi_find_possible_crtcs(drm, dev->of_node);
        /*
         * If we failed to find the CRTC(s) which this encoder is
         * supposed to be connected to, it's because the CRTC has