Merge "msm: camera: isp: Update the reported_req_id correctly" into camera-kernel.lnx.4.0 (6f91e88b) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_isp/cam_isp_context.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1863,7 +1863,6 @@ static int __cam_isp_ctx_notify_sof_in_activated_state(
		if ((!req_isp->bubble_detected) &&
		(req->request_id > ctx_isp->reported_req_id)) {
		request_id = req->request_id;
		ctx_isp->reported_req_id = request_id;
		__cam_isp_ctx_update_event_record(ctx_isp,
		CAM_ISP_CTX_EVENT_EPOCH, req);
		break;
		@@ -1873,6 +1872,9 @@ static int __cam_isp_ctx_notify_sof_in_activated_state(
		if (ctx_isp->substate_activated == CAM_ISP_CTX_ACTIVATED_BUBBLE)
		request_id = 0;

		if (request_id != 0)
		ctx_isp->reported_req_id = request_id;

		__cam_isp_ctx_send_sof_timestamp(ctx_isp, request_id,
		CAM_REQ_MGR_SOF_EVENT_SUCCESS);