On Saturday 10 March 2018 03:52 AM, Enric Balletbo i Serra wrote:
> From: Lin Huang <hl at rock-chips.com>
>
> We need to enable video before analogix_dp_is_video_stream_on(), so
> we can get the right video stream status.
>
> Cc: ?? ? <wzz at rock-chips.com>
> Cc: St?phane Marchesin <marcheu at chromium.org>
> Signed-off-by: Lin Huang <hl at rock-chips.com>
> Signed-off-by: Sean Paul <seanpaul at chromium.org>
> Signed-off-by: Thierry Escande <thierry.escande at collabora.com>
> Reviewed-by: Andrzej Hajda <a.hajda at samsung.com>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo at collabora.com>
> Tested-by: Marek Szyprowski <m.szyprowski at samsung.com>
> ---
>
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> index 5a2e35dc41e3..f9661b410cb9 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> @@ -819,11 +819,10 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp)
> if (analogix_dp_is_slave_video_stream_clock_on(dp) == 0)
> break;
> if (timeout_loop > DP_TIMEOUT_LOOP_COUNT) {
> - dev_err(dp->dev, "Timeout of video streamclk ok\n");
> + dev_err(dp->dev, "Timeout of slave video streamclk ok\n");
> return -ETIMEDOUT;
> }
> -
> - usleep_range(1, 2);
> + usleep_range(1000, 1001);
Could we briefly explain in the commit message why we need to increase
the delay in the timeout loop? Is it a consequence of calling
analogix_dp_start_video() earlier, or is this the preferred time
mentioned in the specs?
Thanks,
Archit
> }
>
> /* Set to use the register calculated M/N video */
> @@ -838,6 +837,9 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp)
> /* Configure video slave mode */
> analogix_dp_enable_video_master(dp, 0);
>
> + /* Enable video */
> + analogix_dp_start_video(dp);
> +
> timeout_loop = 0;
>
> for (;;) {
> @@ -948,9 +950,6 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)
> DRM_ERROR("failed to enable the panel\n");
> }
>
> - /* Enable video */
> - analogix_dp_start_video(dp);
> -
> dp->psr_enable = analogix_dp_detect_sink_psr(dp);
> if (dp->psr_enable)
> analogix_dp_enable_sink_psr(dp);
>
