Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cd09a4e authored by Carlos Palminha's avatar Carlos Palminha Committed by Daniel Vetter
Browse files

drm/imx: removed optional dummy encoder mode_fixup function. 

mode_fixup function for encoder drivers became optional with patch
http://patchwork.freedesktop.org/patch/msgid/1455106522-32307-1-git-send-email-palminha@synopsys.com



This patch set nukes all the dummy mode_fixup implementations.

(made on top of Daniel topic/drm-misc branch)

Signed-off-by: default avatarCarlos Palminha <palminha@synopsys.com>
Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/8bf274e8f6908142a9f940d3f2913e4a735e0caa.1455540137.git.palminha@synopsys.com
parent b3c9b8a6

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

+0 −8
Original line number Diff line number Diff line
@@ -109,13 +109,6 @@ static void dw_hdmi_imx_encoder_disable(struct drm_encoder *encoder) 
{

}



static bool dw_hdmi_imx_encoder_mode_fixup(struct drm_encoder *encoder,

					   const struct drm_display_mode *mode,

					   struct drm_display_mode *adj_mode)

{

	return true;

}



static void dw_hdmi_imx_encoder_mode_set(struct drm_encoder *encoder,

					 struct drm_display_mode *mode,

					 struct drm_display_mode *adj_mode)
@@ -138,7 +131,6 @@ static void dw_hdmi_imx_encoder_prepare(struct drm_encoder *encoder) 
}



static const struct drm_encoder_helper_funcs dw_hdmi_imx_encoder_helper_funcs = {

	.mode_fixup = dw_hdmi_imx_encoder_mode_fixup,

	.mode_set   = dw_hdmi_imx_encoder_mode_set,

	.prepare    = dw_hdmi_imx_encoder_prepare,

	.commit     = dw_hdmi_imx_encoder_commit,

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

+0 −8
Original line number Diff line number Diff line
@@ -139,13 +139,6 @@ static void imx_ldb_encoder_dpms(struct drm_encoder *encoder, int mode) 
{

}



static bool imx_ldb_encoder_mode_fixup(struct drm_encoder *encoder,

			   const struct drm_display_mode *mode,

			   struct drm_display_mode *adjusted_mode)

{

	return true;

}



static void imx_ldb_set_clock(struct imx_ldb *ldb, int mux, int chno,

		unsigned long serial_clk, unsigned long di_clk)

{
@@ -376,7 +369,6 @@ static const struct drm_encoder_funcs imx_ldb_encoder_funcs = { 


static const struct drm_encoder_helper_funcs imx_ldb_encoder_helper_funcs = {

	.dpms = imx_ldb_encoder_dpms,

	.mode_fixup = imx_ldb_encoder_mode_fixup,

	.prepare = imx_ldb_encoder_prepare,

	.commit = imx_ldb_encoder_commit,

	.mode_set = imx_ldb_encoder_mode_set,

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

+0 −8
Original line number Diff line number Diff line
@@ -286,13 +286,6 @@ static void imx_tve_encoder_dpms(struct drm_encoder *encoder, int mode) 
		dev_err(tve->dev, "failed to disable TVOUT: %d\n", ret);

}



static bool imx_tve_encoder_mode_fixup(struct drm_encoder *encoder,

				       const struct drm_display_mode *mode,

				       struct drm_display_mode *adjusted_mode)

{

	return true;

}



static void imx_tve_encoder_prepare(struct drm_encoder *encoder)

{

	struct imx_tve *tve = enc_to_tve(encoder);
@@ -379,7 +372,6 @@ static const struct drm_encoder_funcs imx_tve_encoder_funcs = { 


static const struct drm_encoder_helper_funcs imx_tve_encoder_helper_funcs = {

	.dpms = imx_tve_encoder_dpms,

	.mode_fixup = imx_tve_encoder_mode_fixup,

	.prepare = imx_tve_encoder_prepare,

	.mode_set = imx_tve_encoder_mode_set,

	.commit = imx_tve_encoder_commit,

drivers/gpu/drm/imx/parallel-display.c

+0 −8
Original line number Diff line number Diff line
@@ -112,13 +112,6 @@ static void imx_pd_encoder_dpms(struct drm_encoder *encoder, int mode) 
		drm_panel_enable(imxpd->panel);

}



static bool imx_pd_encoder_mode_fixup(struct drm_encoder *encoder,

			   const struct drm_display_mode *mode,

			   struct drm_display_mode *adjusted_mode)

{

	return true;

}



static void imx_pd_encoder_prepare(struct drm_encoder *encoder)

{

	struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
@@ -166,7 +159,6 @@ static const struct drm_encoder_funcs imx_pd_encoder_funcs = { 


static const struct drm_encoder_helper_funcs imx_pd_encoder_helper_funcs = {

	.dpms = imx_pd_encoder_dpms,

	.mode_fixup = imx_pd_encoder_mode_fixup,

	.prepare = imx_pd_encoder_prepare,

	.commit = imx_pd_encoder_commit,

	.mode_set = imx_pd_encoder_mode_set,