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

Commit 2ca6c5c3 authored by Hariram Purushothaman's avatar Hariram Purushothaman Committed by Matt Wagantall
Browse files

msm: camera: Adopt camera buff mgrs to use VB2 MAX buffs 



Adopt generic buff mgr and isp buff mgr to use
VB2_MAX_FRAME to support v4l2 supported maximum
buffers.

Change-Id: I7e15749e429e0a8c2f19428e78aca7587c000313
Signed-off-by: default avatarHariram Purushothaman <hariramp@codeaurora.org>
parent d3e38341

drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ static int msm_isp_request_bufq(struct msm_isp_buf_mgr *buf_mgr, 
	struct msm_isp_bufq *bufq = NULL;

	CDBG("%s: E\n", __func__);



	if (!buf_request->num_buf || buf_request->num_buf > VIDEO_MAX_FRAME) {

	if (!buf_request->num_buf || buf_request->num_buf > VB2_MAX_FRAME) {

		pr_err("Invalid buffer request\n");

		return rc;

	}

drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static int msm_buf_mngr_handle_cont_cmd(struct msm_buf_mngr_device *dev, 


	if ((cont_cmd->cmd >= MSM_CAMERA_BUF_MNGR_CONT_MAX) ||

		(cont_cmd->cmd < 0) ||

		(cont_cmd->cnt > VIDEO_MAX_FRAME) ||

		(cont_cmd->cnt > VB2_MAX_FRAME) ||

		(cont_cmd->cont_fd < 0)) {

		pr_debug("Invalid arg passed Cmd:%d, cnt:%d, fd:%d\n",

			cont_cmd->cmd, cont_cmd->cnt,