[PATCH 27/40] drm/bridge: analogix_dp: Fix timeout of video streamclk config
Thierry Escande
thierry.escande at collabora.com
Mon Jan 15 09:16:01 PST 2018
From: zain wang <wzz at rock-chips.com>
The STRM_VALID bit in register ANALOGIX_DP_SYS_CTL_3 may be unstable,
so we may hit the error log "Timeout of video streamclk ok" since
checked this unstable bit.
In fact, we can go continue and the streamclk is ok if we wait enough time,
it does no effect on display.
Let's change this error to warn.
Cc: Douglas Anderson <dianders at chromium.org>
Signed-off-by: zain wang <wzz 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>
---
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index b2e369073854..e7ab871e62b5 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -886,9 +886,8 @@ 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_warn(dp->dev,
- "Ignoring timeout of slave video streamclk ok\n");
- break;
+ dev_err(dp->dev, "Timeout of slave video streamclk ok\n");
+ return -ETIMEDOUT;
}
usleep_range(1000, 1001);
}
@@ -920,8 +919,9 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp)
done_count = 0;
}
if (timeout_loop > DP_TIMEOUT_LOOP_COUNT) {
- dev_err(dp->dev, "Timeout of video streamclk ok\n");
- return -ETIMEDOUT;
+ dev_warn(dp->dev,
+ "Ignoring timeout of video streamclk ok\n");
+ break;
}
usleep_range(1000, 1001);
--
2.14.1
More information about the Linux-rockchip
mailing list