Commit f9f3a38d authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/sun4i: Use simple encoder 



The ingenic driver uses empty implementations for its encoders. Replace
the code with the generic simple encoder.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200305155950.2705-15-tzimmermann@suse.de
parent 2d2e89da

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

+3 −9
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <drm/drm_panel.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "sun4i_backend.h"

#include "sun4i_crtc.h"
@@ -204,10 +205,6 @@ static const struct drm_encoder_helper_funcs sun4i_hdmi_helper_funcs = { 
	.mode_valid	= sun4i_hdmi_mode_valid,

};



static const struct drm_encoder_funcs sun4i_hdmi_funcs = {

	.destroy	= drm_encoder_cleanup,

};



static int sun4i_hdmi_get_modes(struct drm_connector *connector)

{

	struct sun4i_hdmi *hdmi = drm_connector_to_sun4i_hdmi(connector);
@@ -611,11 +608,8 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master, 


	drm_encoder_helper_add(&hdmi->encoder,

			       &sun4i_hdmi_helper_funcs);

	ret = drm_encoder_init(drm,

			       &hdmi->encoder,

			       &sun4i_hdmi_funcs,

			       DRM_MODE_ENCODER_TMDS,

			       NULL);

	ret = drm_simple_encoder_init(drm, &hdmi->encoder,

				      DRM_MODE_ENCODER_TMDS);

	if (ret) {

		dev_err(dev, "Couldn't initialise the HDMI encoder\n");

		goto err_put_ddc_i2c;

drivers/gpu/drm/sun4i/sun4i_lvds.c

+3 −9
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <drm/drm_panel.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "sun4i_crtc.h"

#include "sun4i_tcon.h"
@@ -96,10 +97,6 @@ static const struct drm_encoder_helper_funcs sun4i_lvds_enc_helper_funcs = { 
	.enable		= sun4i_lvds_encoder_enable,

};



static const struct drm_encoder_funcs sun4i_lvds_enc_funcs = {

	.destroy	= drm_encoder_cleanup,

};



int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)

{

	struct drm_encoder *encoder;
@@ -121,11 +118,8 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon) 


	drm_encoder_helper_add(&lvds->encoder,

			       &sun4i_lvds_enc_helper_funcs);

	ret = drm_encoder_init(drm,

			       &lvds->encoder,

			       &sun4i_lvds_enc_funcs,

			       DRM_MODE_ENCODER_LVDS,

			       NULL);

	ret = drm_simple_encoder_init(drm, &lvds->encoder,

				      DRM_MODE_ENCODER_LVDS);

	if (ret) {

		dev_err(drm->dev, "Couldn't initialise the lvds encoder\n");

		goto err_out;

drivers/gpu/drm/sun4i/sun4i_rgb.c

+3 −14
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <drm/drm_panel.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "sun4i_crtc.h"

#include "sun4i_tcon.h"
@@ -188,15 +189,6 @@ static struct drm_encoder_helper_funcs sun4i_rgb_enc_helper_funcs = { 
	.mode_valid	= sun4i_rgb_mode_valid,

};



static void sun4i_rgb_enc_destroy(struct drm_encoder *encoder)

{

	drm_encoder_cleanup(encoder);

}



static struct drm_encoder_funcs sun4i_rgb_enc_funcs = {

	.destroy	= sun4i_rgb_enc_destroy,

};



int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)

{

	struct drm_encoder *encoder;
@@ -218,11 +210,8 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon) 


	drm_encoder_helper_add(&rgb->encoder,

			       &sun4i_rgb_enc_helper_funcs);

	ret = drm_encoder_init(drm,

			       &rgb->encoder,

			       &sun4i_rgb_enc_funcs,

			       DRM_MODE_ENCODER_NONE,

			       NULL);

	ret = drm_simple_encoder_init(drm, &rgb->encoder,

				      DRM_MODE_ENCODER_NONE);

	if (ret) {

		dev_err(drm->dev, "Couldn't initialise the rgb encoder\n");

		goto err_out;

drivers/gpu/drm/sun4i/sun4i_tv.c

+3 −14
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <drm/drm_panel.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "sun4i_crtc.h"

#include "sun4i_drv.h"
@@ -473,15 +474,6 @@ static struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = { 
	.mode_set	= sun4i_tv_mode_set,

};



static void sun4i_tv_destroy(struct drm_encoder *encoder)

{

	drm_encoder_cleanup(encoder);

}



static struct drm_encoder_funcs sun4i_tv_funcs = {

	.destroy	= sun4i_tv_destroy,

};



static int sun4i_tv_comp_get_modes(struct drm_connector *connector)

{

	int i;
@@ -592,11 +584,8 @@ static int sun4i_tv_bind(struct device *dev, struct device *master, 


	drm_encoder_helper_add(&tv->encoder,

			       &sun4i_tv_helper_funcs);

	ret = drm_encoder_init(drm,

			       &tv->encoder,

			       &sun4i_tv_funcs,

			       DRM_MODE_ENCODER_TVDAC,

			       NULL);

	ret = drm_simple_encoder_init(drm, &tv->encoder,

				      DRM_MODE_ENCODER_TVDAC);

	if (ret) {

		dev_err(dev, "Couldn't initialise the TV encoder\n");

		goto err_disable_clk;

drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c

+3 −9
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <drm/drm_panel.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "sun4i_crtc.h"

#include "sun4i_tcon.h"
@@ -846,10 +847,6 @@ static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { 
	.enable		= sun6i_dsi_encoder_enable,

};



static const struct drm_encoder_funcs sun6i_dsi_enc_funcs = {

	.destroy	= drm_encoder_cleanup,

};



static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi,

				       const struct mipi_dsi_msg *msg)

{
@@ -1062,11 +1059,8 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, 


	drm_encoder_helper_add(&dsi->encoder,

			       &sun6i_dsi_enc_helper_funcs);

	ret = drm_encoder_init(drm,

			       &dsi->encoder,

			       &sun6i_dsi_enc_funcs,

			       DRM_MODE_ENCODER_DSI,

			       NULL);

	ret = drm_simple_encoder_init(drm, &dsi->encoder,

				      DRM_MODE_ENCODER_DSI);

	if (ret) {

		dev_err(dsi->dev, "Couldn't initialise the DSI encoder\n");

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE