Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11cdc584 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Update last reported request ID correctly" into camera-kernel.lnx.3.1

parents 793cb2b0 37224a0f

drivers/cam_isp/cam_isp_context.c

+6 −2
Original line number Diff line number Diff line
@@ -1137,7 +1137,9 @@ static int __cam_isp_ctx_notify_sof_in_activated_state( 
		}



		list_for_each_entry(req, &ctx->active_req_list, list) {

			if (req->request_id > ctx_isp->reported_req_id) {

			req_isp = (struct cam_isp_ctx_req *) req->req_priv;

			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,
@@ -1362,10 +1364,12 @@ 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);



	if (req->request_id > ctx_isp->reported_req_id) {

	if ((req->request_id > ctx_isp->reported_req_id)

		&& !req_isp->bubble_report) {

		request_id = req->request_id;

		ctx_isp->reported_req_id = request_id;

	}



	__cam_isp_ctx_send_sof_timestamp(ctx_isp, request_id,

		CAM_REQ_MGR_SOF_EVENT_ERROR);

	__cam_isp_ctx_update_event_record(ctx_isp,