Merge "msm: cpp: Support CDS handling in queue buffer path" (a51392ef) · Commits · e / devices / android_kernel_sony_msm8994

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

+15 −0

Original line number	Diff line number	Diff line
		@@ -1485,6 +1485,10 @@ static int msm_cpp_notify_frame_done(struct cpp_device *cpp_dev,
		(processed_frame->identity & 0xFFFF);
		buff_mgr_info.frame_id = processed_frame->frame_id;
		buff_mgr_info.timestamp = processed_frame->timestamp;
		/*
		* Update the reserved field (cds information) to buffer
		* manager structure so it is propogated back to HAL
		*/
		buff_mgr_info.reserved = processed_frame->reserved;
		if (processed_frame->batch_info.batch_mode ==
		BATCH_MODE_VIDEO) {
		@@ -1527,6 +1531,11 @@ static int msm_cpp_notify_frame_done(struct cpp_device *cpp_dev,
		buff_mgr_info.timestamp = processed_frame->timestamp;
		buff_mgr_info.index =
		processed_frame->duplicate_buffer_info.index;
		/*
		* Update the reserved field (cds information) to buffer
		* manager structure so it is propogated back to HAL
		*/
		buff_mgr_info.reserved = processed_frame->reserved;
		if (put_buf) {
		rc = msm_cpp_buffer_ops(cpp_dev,
		VIDIOC_MSM_BUF_MNGR_PUT_BUF,
		@@ -3233,6 +3242,12 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file,
		u32_queue_buf->buff_mgr_info.timestamp.tv_sec;
		k_queue_buf.buff_mgr_info.timestamp.tv_usec =
		u32_queue_buf->buff_mgr_info.timestamp.tv_usec;
		/*
		* Update the reserved field (cds information) to buffer
		* manager structure so that it is propogated back to HAL
		*/
		k_queue_buf.buff_mgr_info.reserved =
		u32_queue_buf->buff_mgr_info.reserved;

		kp_ioctl.ioctl_ptr = (void *)&k_queue_buf;
		kp_ioctl.len = sizeof(struct msm_pproc_queue_buf_info);