Skip to content

Commit 0f1b69f

Browse files
lumagrobclark
authored andcommitted
drm/msm/mdp5: move mdp5_encoder_set_intf_mode after msm_dsi_modeset_init
Move a call to mdp5_encoder_set_intf_mode() after msm_dsi_modeset_init(), removing set_encoder_mode callback. Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Bjorn Andersson <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Rob Clark <[email protected]>
1 parent a2f3d32 commit 0f1b69f

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,6 @@ static int mdp5_set_split_display(struct msm_kms *kms,
209209
slave_encoder);
210210
}
211211

212-
static void mdp5_set_encoder_mode(struct msm_kms *kms,
213-
struct drm_encoder *encoder,
214-
bool cmd_mode)
215-
{
216-
mdp5_encoder_set_intf_mode(encoder, cmd_mode);
217-
}
218-
219212
static void mdp5_kms_destroy(struct msm_kms *kms)
220213
{
221214
struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms));
@@ -287,7 +280,6 @@ static const struct mdp_kms_funcs kms_funcs = {
287280
.get_format = mdp_get_format,
288281
.round_pixclk = mdp5_round_pixclk,
289282
.set_split_display = mdp5_set_split_display,
290-
.set_encoder_mode = mdp5_set_encoder_mode,
291283
.destroy = mdp5_kms_destroy,
292284
#ifdef CONFIG_DEBUG_FS
293285
.debugfs_init = mdp5_kms_debugfs_init,
@@ -448,6 +440,9 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms,
448440
}
449441

450442
ret = msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder);
443+
if (!ret)
444+
mdp5_encoder_set_intf_mode(encoder, msm_dsi_is_cmd_mode(priv->dsi[dsi_id]));
445+
451446
break;
452447
}
453448
default:

0 commit comments

Comments
 (0)