Merge "msm: camera: isp: Fix framedrop reporting" (223ff05e) · Commits · e / devices / android_kernel_xiaomi_markw

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -1615,12 +1615,8 @@ static struct msm_isp_buffer *msm_isp_get_stream_buffer(
		ISP_EVENT_BUF_FATAL_ERROR);
		return buf;
		}
		if (rc < 0) {
		vfe_dev->error_info.
		stream_framedrop_count[bufq_handle & 0xFF]++;
		vfe_dev->error_info.framedrop_flag = 1;
		if (rc < 0)
		return buf;
		}

		if (buf->num_planes != stream_info->num_planes) {
		pr_err("%s: Invalid buffer\n", __func__);
		@@ -2959,14 +2955,13 @@ static int msm_isp_return_empty_buffer(struct vfe_device *vfe_dev,
		msm_isp_halt_send_error(vfe_dev, ISP_EVENT_BUF_FATAL_ERROR);
		return rc;
		}

		if (rc < 0 \|\| buf == NULL) {
		vfe_dev->error_info.
		stream_framedrop_count[bufq_handle & 0xFF]++;
		pr_err("Skip framedrop report due to no buffer\n");
		return rc;
		}

		msm_isp_get_timestamp(&timestamp);

		buf->buf_debug.put_state[buf->buf_debug.put_state_last] =
		MSM_ISP_BUFFER_STATE_DROP_REG;
		buf->buf_debug.put_state_last ^= 1;
		@@ -3531,6 +3526,12 @@ void msm_isp_process_axi_irq_stream(struct vfe_device *vfe_dev,
		}

		if (!done_buf) {
		if (stream_info->buf_divert) {
		vfe_dev->error_info.stream_framedrop_count[
		stream_info->bufq_handle[
		VFE_BUF_QUEUE_DEFAULT] & 0xFF]++;
		vfe_dev->error_info.framedrop_flag = 1;
		}
		spin_unlock_irqrestore(&stream_info->lock, flags);
		return;
		}