On 2024-06-13 20:05:10, Dmitry Baryshkov wrote:
> Make the DPU driver use the TE source specified in the DT. If none is
> specified, the driver defaults to the first GPIO (mdp_vsync0).
mdp_vsync_p?
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 44 ++++++++++++++++++++++++++++++++-
> 1 file changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> index e9991f3756d4..6fcb3cf4a382 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> @@ -505,6 +505,44 @@ static void dpu_kms_wait_flush(struct msm_kms *kms, unsigned crtc_mask)
> dpu_kms_wait_for_commit_done(kms, crtc);
> }
>
> +static const char *dpu_vsync_sources[] = {
> + [DPU_VSYNC_SOURCE_GPIO_0] = "mdp_vsync_p",
> + [DPU_VSYNC_SOURCE_GPIO_1] = "mdp_vsync_s",
> + [DPU_VSYNC_SOURCE_GPIO_2] = "mdp_vsync_e",
> + [DPU_VSYNC_SOURCE_INTF_0] = "mdp_intf0",
> + [DPU_VSYNC_SOURCE_INTF_1] = "mdp_intf1",
> + [DPU_VSYNC_SOURCE_INTF_2] = "mdp_intf2",
> + [DPU_VSYNC_SOURCE_INTF_3] = "mdp_intf3",
> + [DPU_VSYNC_SOURCE_WD_TIMER_0] = "timer0",
> + [DPU_VSYNC_SOURCE_WD_TIMER_1] = "timer1",
> + [DPU_VSYNC_SOURCE_WD_TIMER_2] = "timer2",
> + [DPU_VSYNC_SOURCE_WD_TIMER_3] = "timer3",
> + [DPU_VSYNC_SOURCE_WD_TIMER_4] = "timer4",
> +};
> +
> +static int dpu_kms_dsi_set_te_source(struct msm_display_info *info,
> + struct msm_dsi *dsi)
> +{
> + const char *te_source = msm_dsi_get_te_source(dsi);
Just checking: if the TE source is different and one has dual-DSI, it must be
set on both controllers?
> + int i;
> +
> + if (!te_source) {
> + info->vsync_source = DPU_VSYNC_SOURCE_GPIO_0;
> + return 0;
> + }
> +
> + /* we can not use match_string since dpu_vsync_sources is a sparse array */
Instead of having gaps in the array, you could also store both the vsync_source
and name as the array elements?
> + for (i = 0; i < ARRAY_SIZE(dpu_vsync_sources); i++) {
> + if (dpu_vsync_sources[i] &&
> + !strcmp(dpu_vsync_sources[i], te_source)) {
> + info->vsync_source = i;
> + return 0;
> + }
> + }
> +
> + return -EINVAL;
> +}
> +
> static int _dpu_kms_initialize_dsi(struct drm_device *dev,
> struct msm_drm_private *priv,
> struct dpu_kms *dpu_kms)
> @@ -543,7 +581,11 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev,
>
> info.is_cmd_mode = msm_dsi_is_cmd_mode(priv->dsi[i]);
>
> - info.vsync_source = DPU_VSYNC_SOURCE_GPIO_0;
> + rc = dpu_kms_dsi_set_te_source(&info, priv->dsi[i]);
> + if (rc) {
> + DPU_ERROR("failed to identify TE source for dsi display\n");
> + return rc;
> + }
>
> encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_DSI, &info);
> if (IS_ERR(encoder)) {
>
> --
> 2.39.2
>
