drm/sun4i: tv: Switch to drm_of_find_possible_crtcs
authorChen-Yu Tsai <wens@csie.org>
Thu, 23 Feb 2017 08:05:40 +0000 (16:05 +0800)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Tue, 7 Mar 2017 21:18:24 +0000 (22:18 +0100)
Now that the crtcs have their .port field set properly, we can use
drm_of_find_possible_crtcs to find the connected crtcs, instead of
hardcoding the first crtc as usable. The new code also defers binding
when the upstream crtc hasn't been registered yet.

This makes it easier to support multiple tcons/crtcs.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
drivers/gpu/drm/sun4i/sun4i_tv.c

index c6f47222e8fc733fb73e0a944b545cb0f7e266a8..32ed5fdf0c4d117780f7e3e6914dbbb2fbd7f410 100644 (file)
@@ -19,6 +19,7 @@
 #include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_of.h>
 #include <drm/drm_panel.h>
 
 #include "sun4i_backend.h"
@@ -623,7 +624,12 @@ static int sun4i_tv_bind(struct device *dev, struct device *master,
                goto err_disable_clk;
        }
 
-       tv->encoder.possible_crtcs = BIT(0);
+       tv->encoder.possible_crtcs = drm_of_find_possible_crtcs(drm,
+                                                               dev->of_node);
+       if (!tv->encoder.possible_crtcs) {
+               ret = -EPROBE_DEFER;
+               goto err_disable_clk;
+       }
 
        drm_connector_helper_add(&tv->connector,
                                 &sun4i_tv_comp_connector_helper_funcs);