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

Commit ee8c074a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm-camera2:isp2: Notify dual cam drop"

parents 461c2672 9c2fbb17

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

+7 −2
Original line number Diff line number Diff line
@@ -894,6 +894,9 @@ static void msm_isp_sync_dual_cam_frame_id( 
				ms_res->src_info[i]->dual_hw_ms_info.index);

		}

	}

	/* the number of frames that are dropped */

	vfe_dev->isp_page->dual_cam_drop =

				frame_id - (src_info->frame_id + 1);

	ms_res->active_src_mask |= (1 << src_info->dual_hw_ms_info.index);

	src_info->frame_id = frame_id;

	src_info->dual_hw_ms_info.sync_state = MSM_ISP_DUAL_CAM_SYNC;
@@ -931,6 +934,8 @@ void msm_isp_increment_frame_id(struct vfe_device *vfe_dev, 
				src_info->dual_hw_ms_info.index)) {

				pr_err_ratelimited("Frame out of sync on vfe %d\n",

					vfe_dev->pdev->id);

				/* Notify to do reconfig at SW sync drop*/

				vfe_dev->isp_page->dual_cam_drop_detected = 1;

				/*

				 * set this isp as async mode to force

				 *it sync again at the next sof

include/uapi/media/msmb_isp.h

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ struct isp_kstate { 
	uint32_t kernel_sofid;

	uint32_t drop_reconfig;

	uint32_t vfeid;

	uint32_t dual_cam_drop_detected;

	uint32_t dual_cam_drop;

};



enum ISP_START_PIXEL_PATTERN {