Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8cec328 authored by Shilpa Mamidi's avatar Shilpa Mamidi Committed by Gerrit - the friendly Code Review server
Browse files

msm: cpp: Update duplicate buffer information 



Copy update value to duplicate buffer and also remove
memset of duplicate buffer information to retain values set
from user space.

Change-Id: I4b0b5d135768762225d5fea5bb6f1851a9762cd3
Signed-off-by: default avatarShilpa Mamidi <shilpam@codeaurora.org>
parent 1fabae78

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

+4 −2
Original line number Diff line number Diff line
@@ -2263,8 +2263,6 @@ static int msm_cpp_cfg_frame(struct cpp_device *cpp_dev, 
	if (new_frame->duplicate_output) {

		CPP_DBG("duplication enabled, dup_id=0x%x",

			new_frame->duplicate_identity);

		memset(&new_frame->duplicate_buffer_info, 0,

			sizeof(struct msm_cpp_buffer_info_t));

		memset(&dup_buff_mgr_info, 0, sizeof(struct msm_buf_mngr_info));

		dup_buff_mgr_info.session_id =

			((new_frame->duplicate_identity >> 16) & 0xFFFF);
@@ -2401,6 +2399,8 @@ static int msm_cpp_cfg(struct cpp_device *cpp_dev, 
				k_frame_info.output_buffer_info[i] =

					frame->output_buffer_info[i];

			}

			k_frame_info.duplicate_buffer_info =

				frame->duplicate_buffer_info;

		}

	}
@@ -3382,6 +3382,8 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file, 
					cpp_frame->output_buffer_info[0];

				k32_frame_info.output_buffer_info[1] =

					cpp_frame->output_buffer_info[1];

				k32_frame_info.duplicate_buffer_info =

					cpp_frame->duplicate_buffer_info;

			}

		} else {

			pr_err("%s: Error getting frame\n", __func__);