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

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

Merge "msm: camera: isp: Remove bubble re-apply recovery mechanism" into camera-kernel.lnx.4.0

parents 73b9674d 986223aa

drivers/cam_isp/cam_isp_context.c

+1 −43
Original line number Diff line number Diff line
@@ -966,7 +966,6 @@ static int __cam_isp_ctx_handle_buf_done_for_request( 
				ctx->ctx_id);

		} else {

			list_add(&req->list, &ctx->pending_req_list);

			ctx_isp->bubble_frame_cnt = 0;

			CAM_DBG(CAM_REQ,

				"Move active request %lld to pending list(cnt = %d) [bubble recovery], ctx %u",

				req->request_id, ctx_isp->active_req_cnt,
@@ -1286,44 +1285,6 @@ static int __cam_isp_ctx_notify_sof_in_activated_state( 
	 * In this case, we need to skip the current notification. This

	 * helps the state machine to catch up the delay.

	 */



	if (atomic_read(&ctx_isp->process_bubble)) {



		if (list_empty(&ctx->active_req_list)) {

			CAM_ERR(CAM_ISP,

				"No available active req in bubble");

			atomic_set(&ctx_isp->process_bubble, 0);

			rc = -EINVAL;

			return rc;

		}



		req = list_first_entry(&ctx->active_req_list,

			struct cam_ctx_request, list);

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



		if (ctx_isp->bubble_frame_cnt >= 1 &&

			req_isp->bubble_detected) {

			req_isp->num_acked = 0;

			ctx_isp->bubble_frame_cnt = 0;

			req_isp->bubble_detected = false;

			list_del_init(&req->list);

			list_add(&req->list, &ctx->pending_req_list);

			atomic_set(&ctx_isp->process_bubble, 0);

			ctx_isp->active_req_cnt--;

			CAM_DBG(CAM_REQ,

				"Move active req: %lld to pending list(cnt = %d) [bubble re-apply], ctx %u",

				req->request_id,

				ctx_isp->active_req_cnt, ctx->ctx_id);

		} else if (req_isp->bubble_detected) {

			ctx_isp->bubble_frame_cnt++;

			CAM_DBG(CAM_ISP,

				"Waiting on bufdone for bubble req: %lld, since frame_cnt = %lld",

				req->request_id, ctx_isp->bubble_frame_cnt);

		} else

			CAM_DBG(CAM_ISP, "Delayed bufdone for req: %lld",

				req->request_id);

	}



	if (ctx->ctx_crm_intf && ctx->ctx_crm_intf->notify_trigger &&

		ctx_isp->active_req_cnt <= 2) {

		if (ctx_isp->subscribe_event & CAM_TRIGGER_POINT_SOF) {
@@ -3041,7 +3002,6 @@ static int __cam_isp_ctx_flush_req_in_top_state( 
	}



end:

	ctx_isp->bubble_frame_cnt = 0;

	atomic_set(&ctx_isp->process_bubble, 0);

	atomic_set(&ctx_isp->rxd_epoch, 0);

	return rc;
@@ -4678,7 +4638,6 @@ static int __cam_isp_ctx_start_dev_in_ready(struct cam_context *ctx, 
	ctx_isp->frame_id = 0;

	ctx_isp->active_req_cnt = 0;

	ctx_isp->reported_req_id = 0;

	ctx_isp->bubble_frame_cnt = 0;

	ctx_isp->substate_activated = ctx_isp->rdi_only_context ?

		CAM_ISP_CTX_ACTIVATED_APPLIED :

		(req_isp->num_fence_map_out) ? CAM_ISP_CTX_ACTIVATED_EPOCH :
@@ -4855,7 +4814,6 @@ static int __cam_isp_ctx_stop_dev_in_activated_unlock( 
	ctx_isp->frame_id = 0;

	ctx_isp->active_req_cnt = 0;

	ctx_isp->reported_req_id = 0;

	ctx_isp->bubble_frame_cnt = 0;

	ctx_isp->last_applied_req_id = 0;

	ctx_isp->req_info.last_bufdone_req_id = 0;

	atomic_set(&ctx_isp->process_bubble, 0);
@@ -5330,7 +5288,7 @@ int cam_isp_context_init(struct cam_isp_context *ctx, 
	ctx->active_req_cnt = 0;

	ctx->reported_req_id = 0;

	ctx->req_info.last_bufdone_req_id = 0;

	ctx->bubble_frame_cnt = 0;



	ctx->hw_ctx = NULL;

	ctx->substate_activated = CAM_ISP_CTX_ACTIVATED_SOF;

	ctx->substate_machine = cam_isp_ctx_activated_state_machine;

drivers/cam_isp/cam_isp_context.h

+0 −2
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ struct cam_isp_context_event_record { 
 * @substate_actiavted:        Current substate for the activated state.

 * @process_bubble:            Atomic variable to check if ctx is still

 *                             processing bubble.

 * @bubble_frame_cnt:          Count number of frames since the req is in bubble

 * @substate_machine:          ISP substate machine for external interface

 * @substate_machine_irq:      ISP substate machine for irq handling

 * @req_base:                  Common request object storage
@@ -267,7 +266,6 @@ struct cam_isp_context { 
	uint32_t                         frame_id_meta;

	uint32_t                         substate_activated;

	atomic_t                         process_bubble;

	uint32_t                         bubble_frame_cnt;

	struct cam_ctx_ops              *substate_machine;

	struct cam_isp_ctx_irq_ops      *substate_machine_irq;