| Message ID | 20210717124016.316020-5-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | 0f1b69fea260cf336cb71f9bbdc33d171288d0f9 |
| Headers | show |
| Series | drm/msm/dpu: add support for independent DSI config | expand |
On Sat 17 Jul 07:40 CDT 2021, Dmitry Baryshkov wrote: > Move a call to mdp5_encoder_set_intf_mode() after > msm_dsi_modeset_init(), removing set_encoder_mode callback. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > --- > drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c > index 15aed45022bc..b3b42672b2d4 100644 > --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c > +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c > @@ -209,13 +209,6 @@ static int mdp5_set_split_display(struct msm_kms *kms, > slave_encoder); > } > > -static void mdp5_set_encoder_mode(struct msm_kms *kms, > - struct drm_encoder *encoder, > - bool cmd_mode) > -{ > - mdp5_encoder_set_intf_mode(encoder, cmd_mode); > -} > - > static void mdp5_kms_destroy(struct msm_kms *kms) > { > struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms)); > @@ -287,7 +280,6 @@ static const struct mdp_kms_funcs kms_funcs = { > .get_format = mdp_get_format, > .round_pixclk = mdp5_round_pixclk, > .set_split_display = mdp5_set_split_display, > - .set_encoder_mode = mdp5_set_encoder_mode, > .destroy = mdp5_kms_destroy, > #ifdef CONFIG_DEBUG_FS > .debugfs_init = mdp5_kms_debugfs_init, > @@ -448,6 +440,9 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, > } > > ret = msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder); > + if (!ret) > + mdp5_encoder_set_intf_mode(encoder, msm_dsi_is_cmd_mode(priv->dsi[dsi_id])); > + > break; > } > default: > -- > 2.30.2 >
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 15aed45022bc..b3b42672b2d4 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -209,13 +209,6 @@ static int mdp5_set_split_display(struct msm_kms *kms, slave_encoder); } -static void mdp5_set_encoder_mode(struct msm_kms *kms, - struct drm_encoder *encoder, - bool cmd_mode) -{ - mdp5_encoder_set_intf_mode(encoder, cmd_mode); -} - static void mdp5_kms_destroy(struct msm_kms *kms) { struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms)); @@ -287,7 +280,6 @@ static const struct mdp_kms_funcs kms_funcs = { .get_format = mdp_get_format, .round_pixclk = mdp5_round_pixclk, .set_split_display = mdp5_set_split_display, - .set_encoder_mode = mdp5_set_encoder_mode, .destroy = mdp5_kms_destroy, #ifdef CONFIG_DEBUG_FS .debugfs_init = mdp5_kms_debugfs_init, @@ -448,6 +440,9 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, } ret = msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder); + if (!ret) + mdp5_encoder_set_intf_mode(encoder, msm_dsi_is_cmd_mode(priv->dsi[dsi_id])); + break; } default: