Merge "msm: camera: ife: Reduce config done timeout during stop" into camera-kernel.lnx.4.0

This commit is contained in:
Camera Software Integration 2020-02-04 15:18:23 -08:00 • committed by Gerrit - the friendly Code Review server
commit e0063de3c3

View file

@ -3711,19 +3711,13 @@ static int cam_ife_mgr_stop_hw(void *hw_mgr_priv, void *stop_hw_args)
cam_ife_mgr_pause_hw(ctx);
rc = wait_for_completion_timeout(
&ctx->config_done_complete,
msecs_to_jiffies(300));
if (rc <= 0) {
rc = wait_for_completion_timeout(&ctx->config_done_complete,
msecs_to_jiffies(10));
if (rc == 0) {
CAM_WARN(CAM_ISP,
"config done completion timeout for last applied req_id=%llu rc=%d ctx_index %d",
ctx->applied_req_id, rc, ctx->ctx_index);
rc = -ETIMEDOUT;
} else {
CAM_DBG(CAM_ISP,
"config done Success for req_id=%llu ctx_index %d",
ctx->applied_req_id, ctx->ctx_index);
rc = 0;
}
if (stop_isp->stop_only)