| Message ID | 20210717124016.316020-7-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | ef2cd4273f5392c47ed5cc87f83ec55c15354ee6 |
| Headers | show |
| Series | drm/msm/dpu: add support for independent DSI config | expand |
On Sat 17 Jul 07:40 CDT 2021, Dmitry Baryshkov wrote: > None of the display drivers now implement set_encoder_mode callback. > Stop calling it from the modeset init code. > > 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/dsi/dsi.c | 2 -- > drivers/gpu/drm/msm/dsi/dsi.h | 1 - > drivers/gpu/drm/msm/dsi/dsi_manager.c | 12 ------------ > 3 files changed, 15 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c > index 5201d7eb0490..77c8dba297d8 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi.c > +++ b/drivers/gpu/drm/msm/dsi/dsi.c > @@ -251,8 +251,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, > goto fail; > } > > - msm_dsi_manager_setup_encoder(msm_dsi->id); > - > priv->bridges[priv->num_bridges++] = msm_dsi->bridge; > priv->connectors[priv->num_connectors++] = msm_dsi->connector; > > diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h > index 856a532850c0..e0c3c4409377 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi.h > +++ b/drivers/gpu/drm/msm/dsi/dsi.h > @@ -80,7 +80,6 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id); > struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id); > int msm_dsi_manager_cmd_xfer(int id, const struct mipi_dsi_msg *msg); > bool msm_dsi_manager_cmd_xfer_trigger(int id, u32 dma_base, u32 len); > -void msm_dsi_manager_setup_encoder(int id); > int msm_dsi_manager_register(struct msm_dsi *msm_dsi); > void msm_dsi_manager_unregister(struct msm_dsi *msm_dsi); > bool msm_dsi_manager_validate_current_config(u8 id); > diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c > index 27d3b9ebf831..693078e68fd4 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c > @@ -216,18 +216,6 @@ static int dsi_mgr_bridge_get_id(struct drm_bridge *bridge) > return dsi_bridge->id; > } > > -void msm_dsi_manager_setup_encoder(int id) > -{ > - struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id); > - struct msm_drm_private *priv = msm_dsi->dev->dev_private; > - struct msm_kms *kms = priv->kms; > - struct drm_encoder *encoder = msm_dsi_get_encoder(msm_dsi); > - > - if (encoder && kms->funcs->set_encoder_mode) > - kms->funcs->set_encoder_mode(kms, encoder, > - msm_dsi_is_cmd_mode(msm_dsi)); > -} > - > static int msm_dsi_manager_panel_init(struct drm_connector *conn, u8 id) > { > struct msm_drm_private *priv = conn->dev->dev_private; > -- > 2.30.2 >
diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 5201d7eb0490..77c8dba297d8 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -251,8 +251,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, goto fail; } - msm_dsi_manager_setup_encoder(msm_dsi->id); - priv->bridges[priv->num_bridges++] = msm_dsi->bridge; priv->connectors[priv->num_connectors++] = msm_dsi->connector; diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h index 856a532850c0..e0c3c4409377 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.h +++ b/drivers/gpu/drm/msm/dsi/dsi.h @@ -80,7 +80,6 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id); struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id); int msm_dsi_manager_cmd_xfer(int id, const struct mipi_dsi_msg *msg); bool msm_dsi_manager_cmd_xfer_trigger(int id, u32 dma_base, u32 len); -void msm_dsi_manager_setup_encoder(int id); int msm_dsi_manager_register(struct msm_dsi *msm_dsi); void msm_dsi_manager_unregister(struct msm_dsi *msm_dsi); bool msm_dsi_manager_validate_current_config(u8 id); diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index 27d3b9ebf831..693078e68fd4 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -216,18 +216,6 @@ static int dsi_mgr_bridge_get_id(struct drm_bridge *bridge) return dsi_bridge->id; } -void msm_dsi_manager_setup_encoder(int id) -{ - struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id); - struct msm_drm_private *priv = msm_dsi->dev->dev_private; - struct msm_kms *kms = priv->kms; - struct drm_encoder *encoder = msm_dsi_get_encoder(msm_dsi); - - if (encoder && kms->funcs->set_encoder_mode) - kms->funcs->set_encoder_mode(kms, encoder, - msm_dsi_is_cmd_mode(msm_dsi)); -} - static int msm_dsi_manager_panel_init(struct drm_connector *conn, u8 id) { struct msm_drm_private *priv = conn->dev->dev_private;