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

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

Merge "msm:camera: Adopt cpp and vpe to use buff type"

parents f0753e9a ca5b28f1

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

+6 −0
Original line number Diff line number Diff line
@@ -1853,6 +1853,8 @@ static int msm_cpp_cfg_frame(struct cpp_device *cpp_dev, 
				((new_frame->identity >> 16) & 0xFFFF);

			buff_mgr_info.stream_id =

				(new_frame->identity & 0xFFFF);

			buff_mgr_info.type =

				MSM_CAMERA_BUF_MNGR_BUF_PLANAR;

			rc = msm_cpp_buffer_ops(cpp_dev,

				VIDIOC_MSM_BUF_MNGR_GET_BUF,

				&buff_mgr_info);
@@ -1891,6 +1893,8 @@ static int msm_cpp_cfg_frame(struct cpp_device *cpp_dev, 
			((new_frame->duplicate_identity >> 16) & 0xFFFF);

		dup_buff_mgr_info.stream_id =

			(new_frame->duplicate_identity & 0xFFFF);

		dup_buff_mgr_info.type =

			MSM_CAMERA_BUF_MNGR_BUF_PLANAR;

		rc = msm_cpp_buffer_ops(cpp_dev, VIDIOC_MSM_BUF_MNGR_GET_BUF,

			&dup_buff_mgr_info);

		if (rc < 0) {
@@ -2508,6 +2512,8 @@ STREAM_BUFF_END: 
		buff_mgr_info.session_id =

			((frame_info.identity >> 16) & 0xFFFF);

		buff_mgr_info.stream_id = (frame_info.identity & 0xFFFF);

		buff_mgr_info.type =

			MSM_CAMERA_BUF_MNGR_BUF_PLANAR;

		rc = msm_cpp_buffer_ops(cpp_dev, VIDIOC_MSM_BUF_MNGR_GET_BUF,

			&buff_mgr_info);

		if (rc < 0) {

drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c

+1 −0
Original line number Diff line number Diff line
@@ -1161,6 +1161,7 @@ static int msm_vpe_cfg(struct vpe_device *vpe_dev, 
	memset(&buff_mgr_info, 0, sizeof(struct msm_buf_mngr_info));

	buff_mgr_info.session_id = ((new_frame->identity >> 16) & 0xFFFF);

	buff_mgr_info.stream_id = (new_frame->identity & 0xFFFF);

	buff_mgr_info.type = MSM_CAMERA_BUF_MNGR_BUF_PLANAR;

	rc = msm_vpe_buffer_ops(vpe_dev, VIDIOC_MSM_BUF_MNGR_GET_BUF,

				&buff_mgr_info);

	if (rc < 0) {