Merge "msm: camera: ife: Look into next request if res not found" into camera-kernel.lnx.4.0

This commit is contained in:
Camera Software Integration 2020-02-14 13:34:02 -08:00 • committed by Gerrit - the friendly Code Review server
commit 90d0abfbfd

View file

@ -809,10 +809,28 @@ static int __cam_isp_ctx_handle_buf_done_for_request(
}
if (j == req_isp->num_fence_map_out) {
CAM_ERR(CAM_ISP,
"Can not find matching lane handle 0x%x!",
done->resource_handle[i]);
rc = -EINVAL;
if (done_next_req) {
/*
* If not found in current request, it could be
* belonging to next request, This can happen if
* IRQ delay happens.
*/
CAM_WARN(CAM_ISP,
"BUF_DONE for res 0x%x not found in Req %lld ",
__cam_isp_resource_handle_id_to_type(
done->resource_handle[i]),
req->request_id);
done_next_req->resource_handle
[done_next_req->num_handles++] =
done->resource_handle[i];
} else {
CAM_ERR(CAM_ISP,
"Can not find matching lane handle 0x%x! in Req %lld",
done->resource_handle[i],
req->request_id);
rc = -EINVAL;
}
continue;
}