Merge "msm: camera: fix update frame drop pattern" (95b0ca21) · Commits · e / devices / android_kernel_sony_msm8994

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -1347,7 +1347,10 @@ int msm_isp_update_axi_stream(struct vfe_device vfe_dev, void arg)
		return -EINVAL;
		}
		if (stream_info->state == ACTIVE &&
		stream_info->stream_type == BURST_STREAM) {
		stream_info->stream_type == BURST_STREAM &&
		(1 != update_cmd->num_streams \|\|
		UPDATE_STREAM_FRAMEDROP_PATTERN !=
		update_cmd->update_type)) {
		pr_err("%s: Cannot update active burst stream\n",
		__func__);
		return -EINVAL;
		@@ -1374,6 +1377,9 @@ int msm_isp_update_axi_stream(struct vfe_device vfe_dev, void arg)
		msm_isp_get_framedrop_period(
		update_info->skip_pattern);
		stream_info->runtime_init_frame_drop = 0;
		if (update_info->skip_pattern == SKIP_ALL)
		stream_info->framedrop_pattern = 0x0;
		else
		stream_info->framedrop_pattern = 0x1;
		stream_info->framedrop_period = framedrop_period - 1;
		vfe_dev->hw_info->vfe_ops.axi_ops.