diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2017-02-23 16:05:40 +0800 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-03-07 22:18:24 +0100 |
| commit | 78428d672c2ecdb54c72ae427071c239650cb6c7 (patch) | |
| tree | f4fb4f57ddfb59150270f2f38d38a5b37d700620 | |
| parent | a5154a4d01d7958788366894ceeddd9e1aab5b13 (diff) | |
| download | linux-stable-78428d672c2ecdb54c72ae427071c239650cb6c7.tar.gz linux-stable-78428d672c2ecdb54c72ae427071c239650cb6c7.tar.bz2 linux-stable-78428d672c2ecdb54c72ae427071c239650cb6c7.zip | |
drm/sun4i: tv: Switch to drm_of_find_possible_crtcs
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>
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun4i_tv.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c index c6f47222e8fc..32ed5fdf0c4d 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tv.c +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c @@ -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); |