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

Commit a2f5ccad authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: cpp: Support separate input stream identity."

parents e11a9da9 87b616fd

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

+2 −2
Original line number Diff line number Diff line
@@ -1314,8 +1314,8 @@ static int msm_cpp_cfg(struct cpp_device *cpp_dev, 


	in_phyaddr = msm_cpp_fetch_buffer_info(cpp_dev,

		&new_frame->input_buffer_info,

		((new_frame->identity >> 16) & 0xFFFF),

		(new_frame->identity & 0xFFFF), &in_fd);

		((new_frame->input_buffer_info.identity >> 16) & 0xFFFF),

		(new_frame->input_buffer_info.identity & 0xFFFF), &in_fd);

	if (!in_phyaddr) {

		pr_err("error gettting input physical address\n");

		rc = -EINVAL;

include/media/msmb_pproc.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ struct msm_cpp_buffer_info_t { 
	uint32_t offset;

	uint8_t native_buff;

	uint8_t processed_divert;

	uint32_t identity;

};



struct msm_cpp_stream_buff_info_t {