]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/sun4i: Don't check for LVDS and RGB when TCON has only ch1
authorJernej Skrabec <jernej.skrabec@siol.net>
Mon, 25 Jun 2018 12:02:51 +0000 (14:02 +0200)
committerMaxime Ripard <maxime.ripard@bootlin.com>
Wed, 27 Jun 2018 19:43:55 +0000 (21:43 +0200)
LVDS and RGB interfaces are always connected to TCONs which have channel
0. It doesn't make sense to try to init them on TV TCONs.

Add a check if TCON has channel 0 before trying to init LVDS or RGB
interface.

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-12-jernej.skrabec@siol.net
drivers/gpu/drm/sun4i/sun4i_tcon.c

index 264bcc43da114b5e8e7e6948ad3e2a2495f99aa0..761687ebacbaee01867808f30127a1399514f3e7 100644 (file)
@@ -1106,23 +1106,25 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
                goto err_free_dotclock;
        }
 
-       /*
-        * If we have an LVDS panel connected to the TCON, we should
-        * just probe the LVDS connector. Otherwise, just probe RGB as
-        * we used to.
-        */
-       remote = of_graph_get_remote_node(dev->of_node, 1, 0);
-       if (of_device_is_compatible(remote, "panel-lvds"))
-               if (can_lvds)
-                       ret = sun4i_lvds_init(drm, tcon);
+       if (tcon->quirks->has_channel_0) {
+               /*
+                * If we have an LVDS panel connected to the TCON, we should
+                * just probe the LVDS connector. Otherwise, just probe RGB as
+                * we used to.
+                */
+               remote = of_graph_get_remote_node(dev->of_node, 1, 0);
+               if (of_device_is_compatible(remote, "panel-lvds"))
+                       if (can_lvds)
+                               ret = sun4i_lvds_init(drm, tcon);
+                       else
+                               ret = -EINVAL;
                else
-                       ret = -EINVAL;
-       else
-               ret = sun4i_rgb_init(drm, tcon);
-       of_node_put(remote);
+                       ret = sun4i_rgb_init(drm, tcon);
+               of_node_put(remote);
 
-       if (ret < 0)
-               goto err_free_dotclock;
+               if (ret < 0)
+                       goto err_free_dotclock;
+       }
 
        if (tcon->quirks->needs_de_be_mux) {
                /*