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

drm/zte: Use simple encoder 



The zte 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-23-tzimmermann@suse.de
parent d1956157

drivers/gpu/drm/zte/zx_hdmi.c

+2 −6
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_print.h>

#include <drm/drm_simple_kms_helper.h>



#include <sound/hdmi-codec.h>
@@ -254,10 +255,6 @@ static const struct drm_encoder_helper_funcs zx_hdmi_encoder_helper_funcs = { 
	.mode_set = zx_hdmi_encoder_mode_set,

};



static const struct drm_encoder_funcs zx_hdmi_encoder_funcs = {

	.destroy = drm_encoder_cleanup,

};



static int zx_hdmi_connector_get_modes(struct drm_connector *connector)

{

	struct zx_hdmi *hdmi = to_zx_hdmi(connector);
@@ -313,8 +310,7 @@ static int zx_hdmi_register(struct drm_device *drm, struct zx_hdmi *hdmi) 


	encoder->possible_crtcs = VOU_CRTC_MASK;



	drm_encoder_init(drm, encoder, &zx_hdmi_encoder_funcs,

			 DRM_MODE_ENCODER_TMDS, NULL);

	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);

	drm_encoder_helper_add(encoder, &zx_hdmi_encoder_helper_funcs);



	hdmi->connector.polled = DRM_CONNECTOR_POLL_HPD;

drivers/gpu/drm/zte/zx_tvenc.c

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

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "zx_drm_drv.h"

#include "zx_tvenc_regs.h"
@@ -218,10 +219,6 @@ static const struct drm_encoder_helper_funcs zx_tvenc_encoder_helper_funcs = { 
	.mode_set = zx_tvenc_encoder_mode_set,

};



static const struct drm_encoder_funcs zx_tvenc_encoder_funcs = {

	.destroy = drm_encoder_cleanup,

};



static int zx_tvenc_connector_get_modes(struct drm_connector *connector)

{

	struct zx_tvenc *tvenc = to_zx_tvenc(connector);
@@ -285,8 +282,7 @@ static int zx_tvenc_register(struct drm_device *drm, struct zx_tvenc *tvenc) 
	 */

	encoder->possible_crtcs = BIT(1);



	drm_encoder_init(drm, encoder, &zx_tvenc_encoder_funcs,

			 DRM_MODE_ENCODER_TVDAC, NULL);

	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TVDAC);

	drm_encoder_helper_add(encoder, &zx_tvenc_encoder_helper_funcs);



	connector->interlace_allowed = true;

drivers/gpu/drm/zte/zx_vga.c

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

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "zx_drm_drv.h"

#include "zx_vga_regs.h"
@@ -72,10 +73,6 @@ static const struct drm_encoder_helper_funcs zx_vga_encoder_helper_funcs = { 
	.disable = zx_vga_encoder_disable,

};



static const struct drm_encoder_funcs zx_vga_encoder_funcs = {

	.destroy = drm_encoder_cleanup,

};



static int zx_vga_connector_get_modes(struct drm_connector *connector)

{

	struct zx_vga *vga = to_zx_vga(connector);
@@ -154,8 +151,7 @@ static int zx_vga_register(struct drm_device *drm, struct zx_vga *vga) 


	encoder->possible_crtcs = VOU_CRTC_MASK;



	ret = drm_encoder_init(drm, encoder, &zx_vga_encoder_funcs,

			       DRM_MODE_ENCODER_DAC, NULL);

	ret = drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_DAC);

	if (ret) {

		DRM_DEV_ERROR(dev, "failed to init encoder: %d\n", ret);

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE