Merge "msm: camera: isp: Handle incorrect bubble frame count" into camera-kernel.lnx.1.0 (ef11e3f7) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/cam_isp/cam_isp_context.c

+11 −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>
		@@ -1236,6 +1236,14 @@ static int __cam_isp_ctx_notify_sof_in_activated_state(
		return rc;
		}

		if (ctx_isp->last_sof_timestamp ==
		ctx_isp->sof_timestamp_val) {
		CAM_DBG(CAM_ISP,
		"Tasklet delay detected! Bubble frame check skipped, sof_timestamp: %lld",
		ctx_isp->sof_timestamp_val);
		goto notify_only;
		}

		req = list_first_entry(&ctx->active_req_list,
		struct cam_ctx_request, list);
		req_isp = (struct cam_isp_ctx_req *) req->req_priv;
		@@ -1275,6 +1283,8 @@ static int __cam_isp_ctx_notify_sof_in_activated_state(
		req->request_id, ctx->ctx_id, ctx->link_hdl);
		}

		notify_only:

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