| Message ID | 20180309222327.18689-8-enric.balletbo@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Saturday 10 March 2018 03:52 AM, Enric Balletbo i Serra wrote: > From: Lin Huang <hl@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@rock-chips.com> > Cc: Stéphane Marchesin <marcheu@chromium.org> > Signed-off-by: Lin Huang <hl@rock-chips.com> > Signed-off-by: Sean Paul <seanpaul@chromium.org> > Signed-off-by: Thierry Escande <thierry.escande@collabora.com> > Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> > Tested-by: Marek Szyprowski <m.szyprowski@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); >
Hi Archit, Am Mittwoch, 14. März 2018, 06:59:59 CET schrieb Archit Taneja: > On Saturday 10 March 2018 03:52 AM, Enric Balletbo i Serra wrote: > > From: Lin Huang <hl@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@rock-chips.com> > > Cc: Stéphane Marchesin <marcheu@chromium.org> > > Signed-off-by: Lin Huang <hl@rock-chips.com> > > Signed-off-by: Sean Paul <seanpaul@chromium.org> > > Signed-off-by: Thierry Escande <thierry.escande@collabora.com> > > Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> > > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> > > Tested-by: Marek Szyprowski <m.szyprowski@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? I asked Lin, the original author of this patch, response quoted below: "There is random "Timeout of video streamclk ok" message happen when debug edp panel, So we extend this time, this time do not define in the spec." So it looks like it was working by chance before and this move triggered some sort of timing issue. Heiko
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); } /* 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);