Merge "msm: camera: isp: Reset frameid for RDI" (0e570b40) · Commits · e / devices / android_kernel_xiaomi_markw

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -3031,6 +3031,13 @@ static int msm_isp_stop_axi_stream(struct vfe_device *vfe_dev,
		if (intf >= VFE_RAW_0 &&
		intf < VFE_SRC_MAX) {
		vfe_dev->axi_data.src_info[intf].active = 0;
		/* reset frame_id for RDI path */
		if (halt) {
		vfe_dev->
		axi_data.src_info[intf].frame_id = 0;
		vfe_dev->
		axi_data.src_info[intf].eof_id = 0;
		}
		}
		} else
		src_mask \|= (1 << intf);
		@@ -3075,6 +3082,13 @@ static int msm_isp_stop_axi_stream(struct vfe_device *vfe_dev,
		for (i = VFE_RAW_0; i < VFE_SRC_MAX; i++) {
		if (src_mask & (1 << i)) {
		vfe_dev->axi_data.src_info[i].active = 0;
		/* reset frame_id for RDI path */
		if (halt) {
		vfe_dev->
		axi_data.src_info[i].frame_id = 0;
		vfe_dev->
		axi_data.src_info[i].eof_id = 0;
		}
		}
		}
		}