Merge "msm: camera: isp: Moving req to active list first" into camera-kernel.lnx.6.0

This commit is contained in:
Haritha Chintalapati
2022-01-05 18:05:01 -08:00
committed by Gerrit - the friendly Code Review server

View File

@@ -2697,9 +2697,6 @@ static int __cam_isp_ctx_epoch_in_applied(struct cam_isp_context *ctx_isp,
CAM_INFO_RATE_LIMIT(CAM_ISP, "ctx:%d Report Bubble flag %d req id:%lld",
ctx->ctx_id, req_isp->bubble_report, req->request_id);
__cam_isp_ctx_handle_deferred_buf_done_in_bubble(
ctx_isp, req);
if (req_isp->bubble_report) {
__cam_isp_ctx_notify_error_util(CAM_TRIGGER_POINT_SOF, CRM_KMD_ERR_BUBBLE,
req->request_id, ctx_isp);
@@ -2724,6 +2721,13 @@ static int __cam_isp_ctx_epoch_in_applied(struct cam_isp_context *ctx_isp,
CAM_DBG(CAM_REQ, "move request %lld to active list(cnt = %d), ctx %u",
req->request_id, ctx_isp->active_req_cnt, ctx->ctx_id);
/*
* Handle the deferred buf done after moving
* the bubble req to active req list.
*/
__cam_isp_ctx_handle_deferred_buf_done_in_bubble(
ctx_isp, req);
/*
* Update the record before req pointer to
* other invalid req.