Merge "msm: isp: fix the issue during overflow recovery" (fc1a551e) · Commits · e / devices / android_kernel_xiaomi_markw

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -2473,6 +2473,7 @@ int msm_isp_axi_reset(struct vfe_device *vfe_dev,
		int rc = 0, i, j;
		struct msm_vfe_axi_stream *stream_info;
		struct msm_vfe_axi_shared_data *axi_data = &vfe_dev->axi_data;
		struct msm_vfe_frame_request_queue *queue_req;
		uint32_t bufq_handle = 0, bufq_id = 0;
		struct msm_isp_timestamp timestamp;
		unsigned long flags;
		@@ -2504,7 +2505,16 @@ int msm_isp_axi_reset(struct vfe_device *vfe_dev,
		j--;
		continue;
		}

		stream_info->undelivered_request_cnt = 0;
		while (!list_empty(&stream_info->request_q)) {
		queue_req = list_first_entry_or_null(
		&stream_info->request_q,
		struct msm_vfe_frame_request_queue, list);
		if (queue_req) {
		queue_req->cmd_used = 0;
		list_del(&queue_req->list);
		}
		}
		for (bufq_id = 0; bufq_id < VFE_BUF_QUEUE_MAX; bufq_id++) {
		bufq_handle = stream_info->bufq_handle[bufq_id];
		if (!bufq_handle)