diff options
| author | Carlos Palminha <CARLOS.PALMINHA@synopsys.com> | 2016-02-15 08:00:24 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-02-16 09:33:21 -0500 |
| commit | e7708f3c3fb319ea535d28394b3a949179920dfc (patch) | |
| tree | 625d0fead36cf8415498c5e38b6a73f83dd9180d /drivers/gpu/drm/msm/mdp | |
| parent | 8cd09a4ea468e024632340ede7726a93c8b63b45 (diff) | |
drm/msm/mdp: 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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/77692d9d34c2ed6a035f36d377d3544dbe100114.1455540137.git.palminha@synopsys.com
Diffstat (limited to 'drivers/gpu/drm/msm/mdp')
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 8 |
5 files changed, 0 insertions, 41 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c index 2f57e9453b67..106f0e772595 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c | |||
| @@ -47,13 +47,6 @@ static const struct drm_encoder_funcs mdp4_dsi_encoder_funcs = { | |||
| 47 | .destroy = mdp4_dsi_encoder_destroy, | 47 | .destroy = mdp4_dsi_encoder_destroy, |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | static bool mdp4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, | ||
| 51 | const struct drm_display_mode *mode, | ||
| 52 | struct drm_display_mode *adjusted_mode) | ||
| 53 | { | ||
| 54 | return true; | ||
| 55 | } | ||
| 56 | |||
| 57 | static void mdp4_dsi_encoder_mode_set(struct drm_encoder *encoder, | 50 | static void mdp4_dsi_encoder_mode_set(struct drm_encoder *encoder, |
| 58 | struct drm_display_mode *mode, | 51 | struct drm_display_mode *mode, |
| 59 | struct drm_display_mode *adjusted_mode) | 52 | struct drm_display_mode *adjusted_mode) |
| @@ -163,7 +156,6 @@ static void mdp4_dsi_encoder_enable(struct drm_encoder *encoder) | |||
| 163 | } | 156 | } |
| 164 | 157 | ||
| 165 | static const struct drm_encoder_helper_funcs mdp4_dsi_encoder_helper_funcs = { | 158 | static const struct drm_encoder_helper_funcs mdp4_dsi_encoder_helper_funcs = { |
| 166 | .mode_fixup = mdp4_dsi_encoder_mode_fixup, | ||
| 167 | .mode_set = mdp4_dsi_encoder_mode_set, | 159 | .mode_set = mdp4_dsi_encoder_mode_set, |
| 168 | .disable = mdp4_dsi_encoder_disable, | 160 | .disable = mdp4_dsi_encoder_disable, |
| 169 | .enable = mdp4_dsi_encoder_enable, | 161 | .enable = mdp4_dsi_encoder_enable, |
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c index a21df54cb50f..35ad78a1dc1c 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | |||
| @@ -94,13 +94,6 @@ static const struct drm_encoder_funcs mdp4_dtv_encoder_funcs = { | |||
| 94 | .destroy = mdp4_dtv_encoder_destroy, | 94 | .destroy = mdp4_dtv_encoder_destroy, |
| 95 | }; | 95 | }; |
| 96 | 96 | ||
| 97 | static bool mdp4_dtv_encoder_mode_fixup(struct drm_encoder *encoder, | ||
| 98 | const struct drm_display_mode *mode, | ||
| 99 | struct drm_display_mode *adjusted_mode) | ||
| 100 | { | ||
| 101 | return true; | ||
| 102 | } | ||
| 103 | |||
| 104 | static void mdp4_dtv_encoder_mode_set(struct drm_encoder *encoder, | 97 | static void mdp4_dtv_encoder_mode_set(struct drm_encoder *encoder, |
| 105 | struct drm_display_mode *mode, | 98 | struct drm_display_mode *mode, |
| 106 | struct drm_display_mode *adjusted_mode) | 99 | struct drm_display_mode *adjusted_mode) |
| @@ -234,7 +227,6 @@ static void mdp4_dtv_encoder_enable(struct drm_encoder *encoder) | |||
| 234 | } | 227 | } |
| 235 | 228 | ||
| 236 | static const struct drm_encoder_helper_funcs mdp4_dtv_encoder_helper_funcs = { | 229 | static const struct drm_encoder_helper_funcs mdp4_dtv_encoder_helper_funcs = { |
| 237 | .mode_fixup = mdp4_dtv_encoder_mode_fixup, | ||
| 238 | .mode_set = mdp4_dtv_encoder_mode_set, | 230 | .mode_set = mdp4_dtv_encoder_mode_set, |
| 239 | .enable = mdp4_dtv_encoder_enable, | 231 | .enable = mdp4_dtv_encoder_enable, |
| 240 | .disable = mdp4_dtv_encoder_disable, | 232 | .disable = mdp4_dtv_encoder_disable, |
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c index cd63fedb67cc..bc3d8e719c6c 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | |||
| @@ -260,13 +260,6 @@ static void setup_phy(struct drm_encoder *encoder) | |||
| 260 | mdp4_write(mdp4_kms, REG_MDP4_LVDS_PHY_CFG0, lvds_phy_cfg0); | 260 | mdp4_write(mdp4_kms, REG_MDP4_LVDS_PHY_CFG0, lvds_phy_cfg0); |
| 261 | } | 261 | } |
| 262 | 262 | ||
| 263 | static bool mdp4_lcdc_encoder_mode_fixup(struct drm_encoder *encoder, | ||
| 264 | const struct drm_display_mode *mode, | ||
| 265 | struct drm_display_mode *adjusted_mode) | ||
| 266 | { | ||
| 267 | return true; | ||
| 268 | } | ||
| 269 | |||
| 270 | static void mdp4_lcdc_encoder_mode_set(struct drm_encoder *encoder, | 263 | static void mdp4_lcdc_encoder_mode_set(struct drm_encoder *encoder, |
| 271 | struct drm_display_mode *mode, | 264 | struct drm_display_mode *mode, |
| 272 | struct drm_display_mode *adjusted_mode) | 265 | struct drm_display_mode *adjusted_mode) |
| @@ -430,7 +423,6 @@ static void mdp4_lcdc_encoder_enable(struct drm_encoder *encoder) | |||
| 430 | } | 423 | } |
| 431 | 424 | ||
| 432 | static const struct drm_encoder_helper_funcs mdp4_lcdc_encoder_helper_funcs = { | 425 | static const struct drm_encoder_helper_funcs mdp4_lcdc_encoder_helper_funcs = { |
| 433 | .mode_fixup = mdp4_lcdc_encoder_mode_fixup, | ||
| 434 | .mode_set = mdp4_lcdc_encoder_mode_set, | 426 | .mode_set = mdp4_lcdc_encoder_mode_set, |
| 435 | .disable = mdp4_lcdc_encoder_disable, | 427 | .disable = mdp4_lcdc_encoder_disable, |
| 436 | .enable = mdp4_lcdc_encoder_enable, | 428 | .enable = mdp4_lcdc_encoder_enable, |
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c index 1aa21dba663d..69094cb28103 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | |||
| @@ -188,13 +188,6 @@ static const struct drm_encoder_funcs mdp5_cmd_encoder_funcs = { | |||
| 188 | .destroy = mdp5_cmd_encoder_destroy, | 188 | .destroy = mdp5_cmd_encoder_destroy, |
| 189 | }; | 189 | }; |
| 190 | 190 | ||
| 191 | static bool mdp5_cmd_encoder_mode_fixup(struct drm_encoder *encoder, | ||
| 192 | const struct drm_display_mode *mode, | ||
| 193 | struct drm_display_mode *adjusted_mode) | ||
| 194 | { | ||
| 195 | return true; | ||
| 196 | } | ||
| 197 | |||
| 198 | static void mdp5_cmd_encoder_mode_set(struct drm_encoder *encoder, | 191 | static void mdp5_cmd_encoder_mode_set(struct drm_encoder *encoder, |
| 199 | struct drm_display_mode *mode, | 192 | struct drm_display_mode *mode, |
| 200 | struct drm_display_mode *adjusted_mode) | 193 | struct drm_display_mode *adjusted_mode) |
| @@ -256,7 +249,6 @@ static void mdp5_cmd_encoder_enable(struct drm_encoder *encoder) | |||
| 256 | } | 249 | } |
| 257 | 250 | ||
| 258 | static const struct drm_encoder_helper_funcs mdp5_cmd_encoder_helper_funcs = { | 251 | static const struct drm_encoder_helper_funcs mdp5_cmd_encoder_helper_funcs = { |
| 259 | .mode_fixup = mdp5_cmd_encoder_mode_fixup, | ||
| 260 | .mode_set = mdp5_cmd_encoder_mode_set, | 252 | .mode_set = mdp5_cmd_encoder_mode_set, |
| 261 | .disable = mdp5_cmd_encoder_disable, | 253 | .disable = mdp5_cmd_encoder_disable, |
| 262 | .enable = mdp5_cmd_encoder_enable, | 254 | .enable = mdp5_cmd_encoder_enable, |
| @@ -340,4 +332,3 @@ fail: | |||
| 340 | 332 | ||
| 341 | return ERR_PTR(ret); | 333 | return ERR_PTR(ret); |
| 342 | } | 334 | } |
| 343 | |||
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c index 0d737cad03a6..1d95f9fd9dc7 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | |||
| @@ -112,13 +112,6 @@ static const struct drm_encoder_funcs mdp5_encoder_funcs = { | |||
| 112 | .destroy = mdp5_encoder_destroy, | 112 | .destroy = mdp5_encoder_destroy, |
| 113 | }; | 113 | }; |
| 114 | 114 | ||
| 115 | static bool mdp5_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 | |||
| 122 | static void mdp5_encoder_mode_set(struct drm_encoder *encoder, | 115 | static void mdp5_encoder_mode_set(struct drm_encoder *encoder, |
| 123 | struct drm_display_mode *mode, | 116 | struct drm_display_mode *mode, |
| 124 | struct drm_display_mode *adjusted_mode) | 117 | struct drm_display_mode *adjusted_mode) |
| @@ -287,7 +280,6 @@ static void mdp5_encoder_enable(struct drm_encoder *encoder) | |||
| 287 | } | 280 | } |
| 288 | 281 | ||
| 289 | static const struct drm_encoder_helper_funcs mdp5_encoder_helper_funcs = { | 282 | static const struct drm_encoder_helper_funcs mdp5_encoder_helper_funcs = { |
| 290 | .mode_fixup = mdp5_encoder_mode_fixup, | ||
| 291 | .mode_set = mdp5_encoder_mode_set, | 283 | .mode_set = mdp5_encoder_mode_set, |
| 292 | .disable = mdp5_encoder_disable, | 284 | .disable = mdp5_encoder_disable, |
| 293 | .enable = mdp5_encoder_enable, | 285 | .enable = mdp5_encoder_enable, |
