aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Palminha <CARLOS.PALMINHA@synopsys.com>2016-02-15 08:00:13 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-02-16 09:33:05 -0500
commit8cd09a4ea468e024632340ede7726a93c8b63b45 (patch)
treef34a503089ac96565a1f5e287ca50db6ba2c2590
parentb3c9b8a66f626f3db23353055597918e90c40a06 (diff)
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: Carlos Palminha <palminha@synopsys.com> Acked-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/8bf274e8f6908142a9f940d3f2913e4a735e0caa.1455540137.git.palminha@synopsys.com
-rw-r--r--drivers/gpu/drm/imx/dw_hdmi-imx.c8
-rw-r--r--drivers/gpu/drm/imx/imx-ldb.c8
-rw-r--r--drivers/gpu/drm/imx/imx-tve.c8
-rw-r--r--drivers/gpu/drm/imx/parallel-display.c8
4 files changed, 0 insertions, 32 deletions
diff --git a/drivers/gpu/drm/imx/dw_hdmi-imx.c b/drivers/gpu/drm/imx/dw_hdmi-imx.c
index 063825fecbe2..21d615827837 100644
--- a/drivers/gpu/drm/imx/dw_hdmi-imx.c
+++ b/drivers/gpu/drm/imx/dw_hdmi-imx.c
@@ -109,13 +109,6 @@ static void dw_hdmi_imx_encoder_disable(struct drm_encoder *encoder)
109{ 109{
110} 110}
111 111
112static bool dw_hdmi_imx_encoder_mode_fixup(struct drm_encoder *encoder,
113 const struct drm_display_mode *mode,
114 struct drm_display_mode *adj_mode)
115{
116 return true;
117}
118
119static void dw_hdmi_imx_encoder_mode_set(struct drm_encoder *encoder, 112static void dw_hdmi_imx_encoder_mode_set(struct drm_encoder *encoder,
120 struct drm_display_mode *mode, 113 struct drm_display_mode *mode,
121 struct drm_display_mode *adj_mode) 114 struct drm_display_mode *adj_mode)
@@ -138,7 +131,6 @@ static void dw_hdmi_imx_encoder_prepare(struct drm_encoder *encoder)
138} 131}
139 132
140static const struct drm_encoder_helper_funcs dw_hdmi_imx_encoder_helper_funcs = { 133static const struct drm_encoder_helper_funcs dw_hdmi_imx_encoder_helper_funcs = {
141 .mode_fixup = dw_hdmi_imx_encoder_mode_fixup,
142 .mode_set = dw_hdmi_imx_encoder_mode_set, 134 .mode_set = dw_hdmi_imx_encoder_mode_set,
143 .prepare = dw_hdmi_imx_encoder_prepare, 135 .prepare = dw_hdmi_imx_encoder_prepare,
144 .commit = dw_hdmi_imx_encoder_commit, 136 .commit = dw_hdmi_imx_encoder_commit,
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 22ac482231ed..024d6134b848 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -139,13 +139,6 @@ static void imx_ldb_encoder_dpms(struct drm_encoder *encoder, int mode)
139{ 139{
140} 140}
141 141
142static bool imx_ldb_encoder_mode_fixup(struct drm_encoder *encoder,
143 const struct drm_display_mode *mode,
144 struct drm_display_mode *adjusted_mode)
145{
146 return true;
147}
148
149static void imx_ldb_set_clock(struct imx_ldb *ldb, int mux, int chno, 142static void imx_ldb_set_clock(struct imx_ldb *ldb, int mux, int chno,
150 unsigned long serial_clk, unsigned long di_clk) 143 unsigned long serial_clk, unsigned long di_clk)
151{ 144{
@@ -376,7 +369,6 @@ static const struct drm_encoder_funcs imx_ldb_encoder_funcs = {
376 369
377static const struct drm_encoder_helper_funcs imx_ldb_encoder_helper_funcs = { 370static const struct drm_encoder_helper_funcs imx_ldb_encoder_helper_funcs = {
378 .dpms = imx_ldb_encoder_dpms, 371 .dpms = imx_ldb_encoder_dpms,
379 .mode_fixup = imx_ldb_encoder_mode_fixup,
380 .prepare = imx_ldb_encoder_prepare, 372 .prepare = imx_ldb_encoder_prepare,
381 .commit = imx_ldb_encoder_commit, 373 .commit = imx_ldb_encoder_commit,
382 .mode_set = imx_ldb_encoder_mode_set, 374 .mode_set = imx_ldb_encoder_mode_set,
diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index 292349f0b132..ae7a9fb3b8a2 100644
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -286,13 +286,6 @@ static void imx_tve_encoder_dpms(struct drm_encoder *encoder, int mode)
286 dev_err(tve->dev, "failed to disable TVOUT: %d\n", ret); 286 dev_err(tve->dev, "failed to disable TVOUT: %d\n", ret);
287} 287}
288 288
289static bool imx_tve_encoder_mode_fixup(struct drm_encoder *encoder,
290 const struct drm_display_mode *mode,
291 struct drm_display_mode *adjusted_mode)
292{
293 return true;
294}
295
296static void imx_tve_encoder_prepare(struct drm_encoder *encoder) 289static void imx_tve_encoder_prepare(struct drm_encoder *encoder)
297{ 290{
298 struct imx_tve *tve = enc_to_tve(encoder); 291 struct imx_tve *tve = enc_to_tve(encoder);
@@ -379,7 +372,6 @@ static const struct drm_encoder_funcs imx_tve_encoder_funcs = {
379 372
380static const struct drm_encoder_helper_funcs imx_tve_encoder_helper_funcs = { 373static const struct drm_encoder_helper_funcs imx_tve_encoder_helper_funcs = {
381 .dpms = imx_tve_encoder_dpms, 374 .dpms = imx_tve_encoder_dpms,
382 .mode_fixup = imx_tve_encoder_mode_fixup,
383 .prepare = imx_tve_encoder_prepare, 375 .prepare = imx_tve_encoder_prepare,
384 .mode_set = imx_tve_encoder_mode_set, 376 .mode_set = imx_tve_encoder_mode_set,
385 .commit = imx_tve_encoder_commit, 377 .commit = imx_tve_encoder_commit,
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 0ffef172afb4..363e2c7741e2 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -112,13 +112,6 @@ static void imx_pd_encoder_dpms(struct drm_encoder *encoder, int mode)
112 drm_panel_enable(imxpd->panel); 112 drm_panel_enable(imxpd->panel);
113} 113}
114 114
115static bool imx_pd_encoder_mode_fixup(struct drm_encoder *encoder,
116 const struct drm_display_mode *mode,
117 struct drm_display_mode *adjusted_mode)
118{
119 return true;
120}
121
122static void imx_pd_encoder_prepare(struct drm_encoder *encoder) 115static void imx_pd_encoder_prepare(struct drm_encoder *encoder)
123{ 116{
124 struct imx_parallel_display *imxpd = enc_to_imxpd(encoder); 117 struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
@@ -166,7 +159,6 @@ static const struct drm_encoder_funcs imx_pd_encoder_funcs = {
166 159
167static const struct drm_encoder_helper_funcs imx_pd_encoder_helper_funcs = { 160static const struct drm_encoder_helper_funcs imx_pd_encoder_helper_funcs = {
168 .dpms = imx_pd_encoder_dpms, 161 .dpms = imx_pd_encoder_dpms,
169 .mode_fixup = imx_pd_encoder_mode_fixup,
170 .prepare = imx_pd_encoder_prepare, 162 .prepare = imx_pd_encoder_prepare,
171 .commit = imx_pd_encoder_commit, 163 .commit = imx_pd_encoder_commit,
172 .mode_set = imx_pd_encoder_mode_set, 164 .mode_set = imx_pd_encoder_mode_set,