Merge "msm: camera: isp: Fix camif raw only snapshot usecase" (2175c279) · Commits · e / devices / android_kernel_sony_msm8994

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

+8 −11

Original line number	Diff line number	Diff line
		@@ -316,18 +316,7 @@ static void msm_vfe46_process_input_irq(struct vfe_device *vfe_dev,
		&vfe_dev->fetch_engine_info);
		}

		if (irq_status0 & (1 << 0)) {
		ISP_DBG("%s: SOF IRQ\n", __func__);
		if (vfe_dev->axi_data.src_info[VFE_PIX_0].raw_stream_count > 0
		&& vfe_dev->axi_data.src_info[VFE_PIX_0].
		pix_stream_count == 0) {

		msm_isp_notify(vfe_dev, ISP_EVENT_SOF, VFE_PIX_0, ts);
		if (vfe_dev->axi_data.stream_update[VFE_PIX_0])
		msm_isp_axi_stream_update(vfe_dev, VFE_PIX_0);
		msm_isp_update_framedrop_reg(vfe_dev, VFE_PIX_0);
		}
		}
		if (irq_status0 & (1 << 1))
		ISP_DBG("%s: EOF IRQ\n", __func__);
		}
		@@ -492,6 +481,14 @@ static void msm_vfe46_process_epoch_irq(struct vfe_device *vfe_dev,
		msm_isp_update_framedrop_reg(vfe_dev, VFE_PIX_0);
		msm_isp_update_stats_framedrop_reg(vfe_dev);
		msm_isp_update_error_frame_count(vfe_dev);
		if (vfe_dev->axi_data.src_info[VFE_PIX_0].raw_stream_count > 0
		&& vfe_dev->axi_data.src_info[VFE_PIX_0].
		pix_stream_count == 0) {
		if (vfe_dev->axi_data.stream_update[VFE_PIX_0])
		msm_isp_axi_stream_update(vfe_dev, VFE_PIX_0);
		vfe_dev->hw_info->vfe_ops.core_ops.reg_update(
		vfe_dev, VFE_PIX_0);
		}
		}
		}