Commit 62fbddda authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/imx: Use simple encoder 



The imx 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-9-tzimmermann@suse.de
parent a1170f90

drivers/gpu/drm/imx/dw_hdmi-imx.c

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

#include <drm/drm_encoder.h>

#include <drm/drm_of.h>

#include <drm/drm_simple_kms_helper.h>



#include "imx-drm.h"
@@ -143,10 +144,6 @@ static const struct drm_encoder_helper_funcs dw_hdmi_imx_encoder_helper_funcs = 
	.atomic_check = dw_hdmi_imx_atomic_check,

};



static const struct drm_encoder_funcs dw_hdmi_imx_encoder_funcs = {

	.destroy = drm_encoder_cleanup,

};



static enum drm_mode_status

imx6q_hdmi_mode_valid(struct drm_connector *con,

		      const struct drm_display_mode *mode)
@@ -236,8 +233,7 @@ static int dw_hdmi_imx_bind(struct device *dev, struct device *master, 
		return ret;



	drm_encoder_helper_add(encoder, &dw_hdmi_imx_encoder_helper_funcs);

	drm_encoder_init(drm, encoder, &dw_hdmi_imx_encoder_funcs,

			 DRM_MODE_ENCODER_TMDS, NULL);

	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);



	platform_set_drvdata(pdev, hdmi);

drivers/gpu/drm/imx/imx-drm-core.c

+0 −6
Original line number Diff line number Diff line
@@ -42,12 +42,6 @@ void imx_drm_connector_destroy(struct drm_connector *connector) 
}

EXPORT_SYMBOL_GPL(imx_drm_connector_destroy);



void imx_drm_encoder_destroy(struct drm_encoder *encoder)

{

	drm_encoder_cleanup(encoder);

}

EXPORT_SYMBOL_GPL(imx_drm_encoder_destroy);



static int imx_drm_atomic_check(struct drm_device *dev,

				struct drm_atomic_state *state)

{

drivers/gpu/drm/imx/imx-drm.h

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ int imx_drm_encoder_parse_of(struct drm_device *drm, 
	struct drm_encoder *encoder, struct device_node *np);



void imx_drm_connector_destroy(struct drm_connector *connector);

void imx_drm_encoder_destroy(struct drm_encoder *encoder);



int ipu_planes_assign_pre(struct drm_device *dev,

			  struct drm_atomic_state *state);

drivers/gpu/drm/imx/imx-ldb.c

+2 −6
Original line number Diff line number Diff line
@@ -26,6 +26,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 "imx-drm.h"
@@ -393,10 +394,6 @@ static const struct drm_connector_helper_funcs imx_ldb_connector_helper_funcs = 
	.best_encoder = imx_ldb_connector_best_encoder,

};



static const struct drm_encoder_funcs imx_ldb_encoder_funcs = {

	.destroy = imx_drm_encoder_destroy,

};



static const struct drm_encoder_helper_funcs imx_ldb_encoder_helper_funcs = {

	.atomic_mode_set = imx_ldb_encoder_atomic_mode_set,

	.enable = imx_ldb_encoder_enable,
@@ -441,8 +438,7 @@ static int imx_ldb_register(struct drm_device *drm, 
	}



	drm_encoder_helper_add(encoder, &imx_ldb_encoder_helper_funcs);

	drm_encoder_init(drm, encoder, &imx_ldb_encoder_funcs,

			 DRM_MODE_ENCODER_LVDS, NULL);

	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_LVDS);



	if (imx_ldb_ch->bridge) {

		ret = drm_bridge_attach(&imx_ldb_ch->encoder,

drivers/gpu/drm/imx/imx-tve.c

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

#include <drm/drm_fb_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "imx-drm.h"
@@ -348,10 +349,6 @@ static const struct drm_connector_helper_funcs imx_tve_connector_helper_funcs = 
	.mode_valid = imx_tve_connector_mode_valid,

};



static const struct drm_encoder_funcs imx_tve_encoder_funcs = {

	.destroy = imx_drm_encoder_destroy,

};



static const struct drm_encoder_helper_funcs imx_tve_encoder_helper_funcs = {

	.mode_set = imx_tve_encoder_mode_set,

	.enable = imx_tve_encoder_enable,
@@ -479,8 +476,7 @@ static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve) 
		return ret;



	drm_encoder_helper_add(&tve->encoder, &imx_tve_encoder_helper_funcs);

	drm_encoder_init(drm, &tve->encoder, &imx_tve_encoder_funcs,

			 encoder_type, NULL);

	drm_simple_encoder_init(drm, &tve->encoder, encoder_type);



	drm_connector_helper_add(&tve->connector,

			&imx_tve_connector_helper_funcs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE