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

Commit 1d1ab31d 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: fixes incorrect RDI empty frame handling"

parents e868dcc8 fe914947

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

+1 −1
Original line number Diff line number Diff line
@@ -3446,7 +3446,7 @@ static int msm_isp_request_frame(struct vfe_device *vfe_dev, 
	}

	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[VFE_PIX_0].sof_counter_step)) ||

		axi_data.src_info[frame_src].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,

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

+3 −0
Original line number Diff line number Diff line
@@ -511,6 +511,9 @@ static int msm_isp_cfg_rdi(struct vfe_device *vfe_dev, 
		return -EINVAL;

	}



	vfe_dev->axi_data.

		src_info[input_cfg->input_src].sof_counter_step = 1;



	vfe_dev->axi_data.src_info[input_cfg->input_src].pixel_clock =

		input_cfg->input_pix_clk;

	vfe_dev->hw_info->vfe_ops.core_ops.cfg_rdi_reg(