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

Commit 9535366b authored by Wyes Karny's avatar Wyes Karny
Browse files

msm: camera: isp: Reapply bubble request in RDI path 



For recovery of the bubble the request from active list
should be added back to pending request list.

Change-Id: I8d7d6726ddc3e720665e53e4979a7907b09d86aa
CRs-Fixed: 3011917
Signed-off-by: default avatarWyes Karny <wkarny@codeaurora.org>
parent 5ab24d0f

drivers/cam_isp/cam_isp_context.c

+47 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/debugfs.h>
@@ -3066,6 +3066,7 @@ static int __cam_isp_ctx_rdi_only_sof_in_bubble_applied( 
			ctx_isp->frame_id,

			ctx->ctx_id);

		ctx->ctx_crm_intf->notify_err(&notify);

		atomic_set(&ctx_isp->process_bubble, 1);

	} else {

		req_isp->bubble_report = 0;

	}
@@ -3123,6 +3124,44 @@ static int __cam_isp_ctx_rdi_only_sof_in_bubble_state( 
	ctx_isp->boot_timestamp = sof_event_data->boot_time;

	CAM_DBG(CAM_ISP, "frame id: %lld time stamp:0x%llx",

		ctx_isp->frame_id, ctx_isp->sof_timestamp_val);





	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);

			return -EINVAL;

		}



		if (ctx_isp->last_sof_timestamp ==

			ctx_isp->sof_timestamp_val) {

			CAM_DBG(CAM_ISP,

				"Tasklet delay detected! Bubble frame: %lld check skipped, sof_timestamp: %lld, ctx_id: %d",

				ctx_isp->frame_id,

				ctx_isp->sof_timestamp_val,

				ctx->ctx_id);

			goto end;

		}



		req = list_first_entry(&ctx->active_req_list,

				struct cam_ctx_request, list);

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



		if (req_isp->bubble_detected) {

			req_isp->num_acked = 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);

			goto end;

		}

	}



	/*

	 * Signal all active requests with error and move the  all the active

	 * requests to free list
@@ -3144,6 +3183,7 @@ static int __cam_isp_ctx_rdi_only_sof_in_bubble_state( 
		ctx_isp->active_req_cnt--;

	}



end:

	/* notify reqmgr with sof signal */

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

		notify.link_hdl = ctx->link_hdl;
@@ -3174,6 +3214,7 @@ static int __cam_isp_ctx_rdi_only_sof_in_bubble_state( 
		__cam_isp_ctx_substate_val_to_type(

		ctx_isp->substate_activated));



	ctx_isp->last_sof_timestamp = ctx_isp->sof_timestamp_val;

	return 0;

}
@@ -3426,6 +3467,7 @@ static int __cam_isp_ctx_release_hw_in_top_state(struct cam_context *ctx, 
	ctx_isp->hw_acquired = false;

	ctx_isp->init_received = false;

	ctx_isp->req_info.last_bufdone_req_id = 0;

	ctx_isp->last_sof_timestamp = 0;



	atomic64_set(&ctx_isp->state_monitor_head, -1);
@@ -3490,6 +3532,7 @@ static int __cam_isp_ctx_release_dev_in_top_state(struct cam_context *ctx, 
	ctx_isp->init_received = false;

	ctx_isp->rdi_only_context = false;

	ctx_isp->req_info.last_bufdone_req_id = 0;

	ctx_isp->last_sof_timestamp = 0;



	atomic64_set(&ctx_isp->state_monitor_head, -1);

	for (i = 0; i < CAM_ISP_CTX_EVENT_MAX; i++)
@@ -3830,6 +3873,7 @@ static int __cam_isp_ctx_acquire_dev_in_available(struct cam_context *ctx, 
	ctx_isp->hw_acquired = true;

	ctx_isp->split_acquire = false;

	ctx->ctxt_to_hw_map = param.ctxt_to_hw_map;

	ctx_isp->last_sof_timestamp = 0;



	atomic64_set(&ctx_isp->state_monitor_head, -1);

	for (i = 0; i < CAM_ISP_CTX_EVENT_MAX; i++)
@@ -3987,6 +4031,7 @@ static int __cam_isp_ctx_acquire_hw_v1(struct cam_context *ctx, 
	ctx_isp->hw_ctx = param.ctxt_to_hw_map;

	ctx_isp->hw_acquired = true;

	ctx->ctxt_to_hw_map = param.ctxt_to_hw_map;

	ctx_isp->last_sof_timestamp = 0;



	atomic64_set(&ctx_isp->state_monitor_head, -1);
@@ -4132,6 +4177,7 @@ static int __cam_isp_ctx_acquire_hw_v2(struct cam_context *ctx, 
	ctx_isp->hw_ctx = param.ctxt_to_hw_map;

	ctx_isp->hw_acquired = true;

	ctx->ctxt_to_hw_map = param.ctxt_to_hw_map;

	ctx_isp->last_sof_timestamp = 0;



	trace_cam_context_state("ISP", ctx);

	CAM_DBG(CAM_ISP,

drivers/cam_isp/cam_isp_context.h

+3 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#ifndef _CAM_ISP_CONTEXT_H_
@@ -232,6 +232,7 @@ struct cam_isp_context_event_record { 
 * @req_isp:                   ISP private request object storage

 * @hw_ctx:                    HW object returned by the acquire device command

 * @sof_timestamp_val:         Captured time stamp value at sof hw event

 * @last_sof_timestamp:        Time stamp value for last SOF event

 * @boot_timestamp:            Boot time stamp for a given req_id

 * @active_req_cnt:            Counter for the active request

 * @reported_req_id:           Last reported request id
@@ -268,6 +269,7 @@ struct cam_isp_context { 


	void                            *hw_ctx;

	uint64_t                         sof_timestamp_val;

	uint64_t                         last_sof_timestamp;

	uint64_t                         boot_timestamp;

	int32_t                          active_req_cnt;

	int64_t                          reported_req_id;