diff options
author | Carlos Palminha <CARLOS.PALMINHA@synopsys.com> | 2016-02-16 09:18:26 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-03-04 11:59:27 -0500 |
commit | b205b8ebc56cdee75239399cd4dd880d6919c35b (patch) | |
tree | 793b855186c7780c1d2b94976b73645bb835248b | |
parent | 4091e54e846c4813ef93f2471a0f358d07ca9510 (diff) |
drm/msm/mdp: removed optional dummy crtc mode_fixup function.
This patch set nukes all the dummy crtc 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>
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c index 909d74250de7..38329a617da0 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | |||
@@ -147,13 +147,6 @@ static void mdp4_crtc_destroy(struct drm_crtc *crtc) | |||
147 | kfree(mdp4_crtc); | 147 | kfree(mdp4_crtc); |
148 | } | 148 | } |
149 | 149 | ||
150 | static bool mdp4_crtc_mode_fixup(struct drm_crtc *crtc, | ||
151 | const struct drm_display_mode *mode, | ||
152 | struct drm_display_mode *adjusted_mode) | ||
153 | { | ||
154 | return true; | ||
155 | } | ||
156 | |||
157 | /* statically (for now) map planes to mixer stage (z-order): */ | 150 | /* statically (for now) map planes to mixer stage (z-order): */ |
158 | static const int idxs[] = { | 151 | static const int idxs[] = { |
159 | [VG1] = 1, | 152 | [VG1] = 1, |
@@ -508,7 +501,6 @@ static const struct drm_crtc_funcs mdp4_crtc_funcs = { | |||
508 | }; | 501 | }; |
509 | 502 | ||
510 | static const struct drm_crtc_helper_funcs mdp4_crtc_helper_funcs = { | 503 | static const struct drm_crtc_helper_funcs mdp4_crtc_helper_funcs = { |
511 | .mode_fixup = mdp4_crtc_mode_fixup, | ||
512 | .mode_set_nofb = mdp4_crtc_mode_set_nofb, | 504 | .mode_set_nofb = mdp4_crtc_mode_set_nofb, |
513 | .disable = mdp4_crtc_disable, | 505 | .disable = mdp4_crtc_disable, |
514 | .enable = mdp4_crtc_enable, | 506 | .enable = mdp4_crtc_enable, |
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c index 46682aa8870c..d6b45eb57d4f 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | |||
@@ -185,13 +185,6 @@ static void mdp5_crtc_destroy(struct drm_crtc *crtc) | |||
185 | kfree(mdp5_crtc); | 185 | kfree(mdp5_crtc); |
186 | } | 186 | } |
187 | 187 | ||
188 | static bool mdp5_crtc_mode_fixup(struct drm_crtc *crtc, | ||
189 | const struct drm_display_mode *mode, | ||
190 | struct drm_display_mode *adjusted_mode) | ||
191 | { | ||
192 | return true; | ||
193 | } | ||
194 | |||
195 | /* | 188 | /* |
196 | * blend_setup() - blend all the planes of a CRTC | 189 | * blend_setup() - blend all the planes of a CRTC |
197 | * | 190 | * |
@@ -634,7 +627,6 @@ static const struct drm_crtc_funcs mdp5_crtc_funcs = { | |||
634 | }; | 627 | }; |
635 | 628 | ||
636 | static const struct drm_crtc_helper_funcs mdp5_crtc_helper_funcs = { | 629 | static const struct drm_crtc_helper_funcs mdp5_crtc_helper_funcs = { |
637 | .mode_fixup = mdp5_crtc_mode_fixup, | ||
638 | .mode_set_nofb = mdp5_crtc_mode_set_nofb, | 630 | .mode_set_nofb = mdp5_crtc_mode_set_nofb, |
639 | .disable = mdp5_crtc_disable, | 631 | .disable = mdp5_crtc_disable, |
640 | .enable = mdp5_crtc_enable, | 632 | .enable = mdp5_crtc_enable, |