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

Commit 4cb91db6 authored by Karthik Anantha Ram's avatar Karthik Anantha Ram
Browse files

msm: camera: isp: Report bubble on request in wait list 



We need to report error on the request in wait list instead
of pending list. Also, if bubble report flag is enabled then
this request will be reapplied, hence move it back to
pending list.

Change-Id: I6283c223f2e6232f811407487d86b6b7872ff011
Signed-off-by: default avatarKarthik Anantha Ram <kartanan@codeaurora.org>
parent 92e25747

drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c

+6 −3
Original line number Diff line number Diff line
@@ -722,9 +722,9 @@ static int __cam_isp_ctx_epoch_in_applied(struct cam_isp_context *ctx_isp, 
	struct cam_context        *ctx = ctx_isp->base;

	uint64_t  request_id = 0;



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

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

		/*

		 * If no pending req in epoch, this is an error case.

		 * If no wait req in epoch, this is an error case.

		 * The recovery is to go back to sof state

		 */

		CAM_ERR(CAM_ISP, "No pending request");
@@ -737,7 +737,7 @@ static int __cam_isp_ctx_epoch_in_applied(struct cam_isp_context *ctx_isp, 
		goto end;

	}



	req = list_first_entry(&ctx->pending_req_list, struct cam_ctx_request,

	req = list_first_entry(&ctx->wait_req_list, struct cam_ctx_request,

		list);

	req_isp = (struct cam_isp_ctx_req *)req->req_priv;
@@ -746,6 +746,9 @@ static int __cam_isp_ctx_epoch_in_applied(struct cam_isp_context *ctx_isp, 
		ctx->ctx_crm_intf->notify_err) {

		struct cam_req_mgr_error_notify notify;



		list_del_init(&req->list);

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



		notify.link_hdl = ctx->link_hdl;

		notify.dev_hdl = ctx->dev_hdl;

		notify.req_id = req->request_id;