| Message ID | 20170310043305.17216-30-seanpaul@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10.03.2017 05:32, Sean Paul wrote: > From: zain wang <wzz@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. Description does not describe the change from warn to err in case of slave video clk. Beside this: Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> -- Regards Andrzej > > Cc: Douglas Anderson <dianders@chromium.org> > Signed-off-by: zain wang <wzz@rock-chips.com> > Signed-off-by: Sean Paul <seanpaul@chromium.org> > --- > 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 35ea04ff4078..4ebbf3053639 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);
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 35ea04ff4078..4ebbf3053639 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);