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

Commit b88c1f23 authored by Shubhraprakash Das's avatar Shubhraprakash Das
Browse files

msm: camera: isp: Use the frame id from correct source 



Use frame id from the correct input source instead of the
pix input source all the time.

CRs-Fixed: 2029688
Change-Id: I0a16adf5c8bfa114b4d97f557775ffe86d4fb8f5
Signed-off-by: default avatarShubhraprakash Das <sadas@codeaurora.org>
parent 6319cf03

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+8 −9
Original line number Diff line number Diff line
@@ -3365,22 +3365,21 @@ static int msm_isp_request_frame(struct vfe_device *vfe_dev, 
	/*

	 * If frame_id = 1 then no eof check is needed

	 */

	if (vfe_dev->axi_data.src_info[VFE_PIX_0].active &&

		vfe_dev->axi_data.src_info[VFE_PIX_0].accept_frame == false) {

	if (vfe_dev->axi_data.src_info[frame_src].active &&

		frame_src == VFE_PIX_0 &&

		vfe_dev->axi_data.src_info[frame_src].accept_frame == false) {

		pr_debug("%s:%d invalid time to request frame %d\n",

			__func__, __LINE__, frame_id);

		goto error;

	}

	if ((vfe_dev->axi_data.src_info[VFE_PIX_0].active && (frame_id !=

		vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id + vfe_dev->

		axi_data.src_info[VFE_PIX_0].sof_counter_step)) ||

		((!vfe_dev->axi_data.src_info[VFE_PIX_0].active) && (frame_id !=

	if ((vfe_dev->axi_data.src_info[frame_src].active && (frame_id !=

		vfe_dev->axi_data.src_info[frame_src].frame_id + vfe_dev->

		axi_data.src_info[frame_src].sof_counter_step))) {

		axi_data.src_info[VFE_PIX_0].sof_counter_step)) ||

		((!vfe_dev->axi_data.src_info[frame_src].active))) {

		pr_debug("%s:%d invalid frame id %d cur frame id %d pix %d\n",

			__func__, __LINE__, frame_id,

			vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id,

			vfe_dev->axi_data.src_info[VFE_PIX_0].active);

			vfe_dev->axi_data.src_info[frame_src].frame_id,

			vfe_dev->axi_data.src_info[frame_src].active);

		goto error;

	}

	if (stream_info->undelivered_request_cnt >= MAX_BUFFERS_IN_HW) {