On 31 October 2015 at 01:20, Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> wrote: > Some Allwinner SoCs have an IP called the TV encoder that is used to output > composite and VGA signals. In such a case, we need to use the second TCON > channel. > > Add support for that TV encoder. > > Signed-off-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/sun4i/Makefile | 1 + > drivers/gpu/drm/sun4i/sun4i_drv.c | 10 +- > drivers/gpu/drm/sun4i/sun4i_tv.c | 532 ++++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/sun4i/sun4i_tv.h | 18 ++ > 4 files changed, 560 insertions(+), 1 deletion(-) > create mode 100644 drivers/gpu/drm/sun4i/sun4i_tv.c > create mode 100644 drivers/gpu/drm/sun4i/sun4i_tv.h > > diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile > index 4d230b658a05..fc0dc8be82d9 100644 > --- a/drivers/gpu/drm/sun4i/Makefile > +++ b/drivers/gpu/drm/sun4i/Makefile > @@ -6,5 +6,6 @@ sun4i-drm-y += sun4i_layer.o > sun4i-drm-y += sun4i_tcon.o > > sun4i-drm-y += sun4i_rgb.o > +sun4i-drm-y += sun4i_tv.o > > obj-$(CONFIG_DRM_SUN4I) += sun4i-drm.o > diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c > index f2c9c8a2eb75..3cf7a9e89afa 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_drv.c > +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c > @@ -22,6 +22,7 @@ > #include "sun4i_layer.h" > #include "sun4i_rgb.h" > #include "sun4i_tcon.h" > +#include "sun4i_tv.h" > > static void sun4i_drv_preclose(struct drm_device *drm, > struct drm_file *file_priv) > @@ -134,12 +135,18 @@ static int sun4i_drv_load(struct drm_device *drm, unsigned long flags) > goto err_free_crtc; > } > > + ret = sun4i_tv_init(drm); > + if (ret) { > + dev_err(drm->dev, "Couldn't create our RGB output\n"); RGB should be composite. Seems like a copy-paste error. > + goto err_free_rgb; > + } > + > /* Create our framebuffer */ > drv->fbdev = sun4i_framebuffer_init(drm); > if (IS_ERR(drv->fbdev)) { > dev_err(drm->dev, "Couldn't create our framebuffer\n"); > ret = PTR_ERR(drv->fbdev); > - goto err_free_rgb; > + goto err_free_tv; > } > > /* Enable connectors polling */ Regards, Jonathan -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html