On Sat 17 Jul 07:40 CDT 2021, Dmitry Baryshkov wrote:
> Add three helper functions to be used by display drivers for setting up
> encoders.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> Reviewed-by: Abhinav Kumar <abhinavk@xxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/msm/dsi/dsi.c | 7 +++++++
> drivers/gpu/drm/msm/dsi/dsi_manager.c | 19 +++++++++++--------
> drivers/gpu/drm/msm/msm_drv.h | 17 +++++++++++++++--
> 3 files changed, 33 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
> index 75afc12a7b25..5201d7eb0490 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi.c
> @@ -13,6 +13,13 @@ struct drm_encoder *msm_dsi_get_encoder(struct msm_dsi *msm_dsi)
> return msm_dsi->encoder;
> }
>
> +bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi)
> +{
> + unsigned long host_flags = msm_dsi_host_get_mode_flags(msm_dsi->host);
> +
> + return !(host_flags & MIPI_DSI_MODE_VIDEO);
> +}
> +
> static int dsi_get_phy(struct msm_dsi *msm_dsi)
> {
> struct platform_device *pdev = msm_dsi->pdev;
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> index b20645ab279b..27d3b9ebf831 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> @@ -216,12 +216,6 @@ static int dsi_mgr_bridge_get_id(struct drm_bridge *bridge)
> return dsi_bridge->id;
> }
>
> -static bool dsi_mgr_is_cmd_mode(struct msm_dsi *msm_dsi)
> -{
> - unsigned long host_flags = msm_dsi_host_get_mode_flags(msm_dsi->host);
> - return !(host_flags & MIPI_DSI_MODE_VIDEO);
> -}
> -
> void msm_dsi_manager_setup_encoder(int id)
> {
> struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);
> @@ -231,7 +225,7 @@ void msm_dsi_manager_setup_encoder(int id)
>
> if (encoder && kms->funcs->set_encoder_mode)
> kms->funcs->set_encoder_mode(kms, encoder,
> - dsi_mgr_is_cmd_mode(msm_dsi));
> + msm_dsi_is_cmd_mode(msm_dsi));
> }
>
> static int msm_dsi_manager_panel_init(struct drm_connector *conn, u8 id)
> @@ -276,7 +270,7 @@ static int msm_dsi_manager_panel_init(struct drm_connector *conn, u8 id)
> if (other_dsi && other_dsi->panel && kms->funcs->set_split_display) {
> kms->funcs->set_split_display(kms, master_dsi->encoder,
> slave_dsi->encoder,
> - dsi_mgr_is_cmd_mode(msm_dsi));
> + msm_dsi_is_cmd_mode(msm_dsi));
> }
>
> out:
> @@ -839,3 +833,12 @@ void msm_dsi_manager_unregister(struct msm_dsi *msm_dsi)
> msm_dsim->dsi[msm_dsi->id] = NULL;
> }
>
> +bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi)
> +{
> + return IS_BONDED_DSI();
> +}
> +
> +bool msm_dsi_is_master_dsi(struct msm_dsi *msm_dsi)
> +{
> + return IS_MASTER_DSI_LINK(msm_dsi->id);
> +}
> diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
> index 1a48a709ffb3..9bfd37855969 100644
> --- a/drivers/gpu/drm/msm/msm_drv.h
> +++ b/drivers/gpu/drm/msm/msm_drv.h
> @@ -350,7 +350,9 @@ void __exit msm_dsi_unregister(void);
> int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
> struct drm_encoder *encoder);
> void msm_dsi_snapshot(struct msm_disp_state *disp_state, struct msm_dsi *msm_dsi);
> -
> +bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi);
> +bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi);
> +bool msm_dsi_is_master_dsi(struct msm_dsi *msm_dsi);
> #else
> static inline void __init msm_dsi_register(void)
> {
> @@ -367,7 +369,18 @@ static inline int msm_dsi_modeset_init(struct msm_dsi *msm_dsi,
> static inline void msm_dsi_snapshot(struct msm_disp_state *disp_state, struct msm_dsi *msm_dsi)
> {
> }
> -
> +static inline bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi)
> +{
> + return false;
> +}
> +static bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi)
Missing "inline"
> +{
> + return false;
> +}
> +bool msm_dsi_is_master_dsi(struct msm_dsi *msm_dsi)
Same.
Looks good otherwise!
Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
Regards,
Bjorn
> +{
> + return false;
> +}
> #endif
>
> #ifdef CONFIG_DRM_MSM_DP
> --
> 2.30.2
>
