Merge "msm: cpp: Check for validity of processed frame in cpp timeout" (d4b63712) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -1667,6 +1667,17 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)
		goto end;
		}

		for (i = 0; i < queue_len; i++) {
		processed_frame[i] = cpp_timer.data.processed_frame[i];
		if (!processed_frame[i]) {
		pr_warn("process frame null , queue len %d", queue_len);
		msm_cpp_flush_queue_and_release_buffer(cpp_dev,
		queue_len);
		msm_cpp_set_micro_irq_mask(cpp_dev, 1, 0x8);
		goto end;
		}
		}

		atomic_set(&cpp_timer.used, 1);
		pr_warn("Starting timer to fire in %d ms. (jiffies=%lu)\n",
		CPP_CMD_TIMEOUT_MS, jiffies);
		@@ -1675,9 +1686,6 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)

		msm_cpp_set_micro_irq_mask(cpp_dev, 1, 0x8);

		for (i = 0; i < MAX_CPP_PROCESSING_FRAME; i++)
		processed_frame[i] = cpp_timer.data.processed_frame[i];

		for (i = 0; i < queue_len; i++) {
		pr_warn("Rescheduling for identity=0x%x, frame_id=%03d\n",
		processed_frame[i]->identity,