Merge "msm: camera: isp: Mask process_bubble for SHDR usecase" into camera-kernel.lnx.4.0 (fb2d46d4) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_isp/cam_isp_context.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -864,6 +864,18 @@ static int __cam_isp_ctx_handle_buf_done_for_req_list(
		list_add_tail(&req->list, &ctx->free_req_list);
		req_isp->reapply = false;
		req_isp->cdm_reset_before_apply = false;
		req_isp->num_acked = 0;
		req_isp->num_deferred_acks = 0;
		req_isp->bubble_detected = false;
		/*
		* Only update the process_bubble and bubble_frame_cnt
		* when bubble is detected on this req, in case the other
		* request is processing bubble.
		*/
		if (req_isp->bubble_detected) {
		atomic_set(&ctx_isp->process_bubble, 0);
		ctx_isp->bubble_frame_cnt = 0;
		}

		CAM_DBG(CAM_REQ,
		"Move active request %lld to free list(cnt = %d) [all fences done], ctx %u",
		@@ -2101,6 +2113,7 @@ static int __cam_isp_ctx_epoch_in_applied(struct cam_isp_context *ctx_isp,
		ctx_isp->frame_id, ctx->ctx_id);
		}
		}
		atomic_set(&ctx_isp->process_bubble, 1);
		}

		/*
		@@ -2336,6 +2349,7 @@ static int __cam_isp_ctx_epoch_in_bubble_applied(
		ctx_isp->frame_id, ctx->ctx_id);
		}
		}
		atomic_set(&ctx_isp->process_bubble, 1);
		}

		/*