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

Commit eda805bb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Disable frame id recovery by default"

parents d57528f2 0ce48d46

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+1 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ struct msm_vfe_axi_shared_data { 
	struct msm_vfe_src_info src_info[VFE_SRC_MAX];

	uint16_t stream_handle_cnt;

	uint32_t event_mask;

	uint8_t enable_frameid_recovery;

};



struct msm_vfe_stats_hardware_info {

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

+2 −3
Original line number Diff line number Diff line
@@ -1289,8 +1289,6 @@ static int msm_isp_cfg_ping_pong_address(struct vfe_device *vfe_dev, 
			vfe_dev->error_info.

				stream_framedrop_count[stream_idx]++;

			vfe_dev->error_info.framedrop_flag = 1;

			pr_err_ratelimited("%s: get buf fail! , rc = %d\n",

				__func__, rc);

			return rc;

		}
@@ -1460,7 +1458,8 @@ static void msm_isp_process_done_buf(struct vfe_device *vfe_dev, 
			vfe_dev->pdev->id, buf->buf_idx);

		return;

	} else if (rc == 0) {

		if (buf->frame_id != frame_id) {

		if ((buf->frame_id != frame_id) &&

			vfe_dev->axi_data.enable_frameid_recovery) {

			struct msm_isp_event_data error_event;



			error_event.frame_id =

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

+1 −0
Original line number Diff line number Diff line
@@ -2045,6 +2045,7 @@ int msm_isp_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 
	memset(&vfe_dev->fetch_engine_info, 0,

		sizeof(vfe_dev->fetch_engine_info));

	vfe_dev->axi_data.hw_info = vfe_dev->hw_info->axi_hw_info;

	vfe_dev->axi_data.enable_frameid_recovery = 0;

	vfe_dev->taskletq_idx = 0;

	vfe_dev->vt_enable = 0;

	vfe_dev->reg_update_requested = 0;