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

Commit be8d9601 authored by Konstantin Motov's avatar Konstantin Motov Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: Add support for buffer dequeue form user space 



Add support for dequeuing buffers from user space. It is needed for
dynamic unregistration of user buffers.

Change-Id: Idfb51fe5801422b1249ca352b0daa0e96f50e130
Signed-off-by: default avatarKonstantin Motov <kmotov@codeaurora.org>
parent 8450d1c2

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

+75 −3
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static int msm_isp_buf_prepare(struct msm_isp_buf_mgr *buf_mgr, 
	return rc;

}



static int msm_isp_buf_unprepare(struct msm_isp_buf_mgr *buf_mgr,

static int msm_isp_buf_unprepare_all(struct msm_isp_buf_mgr *buf_mgr,

	uint32_t buf_handle)

{

	int rc = -1, i;
@@ -359,6 +359,36 @@ static int msm_isp_get_buf_by_index(struct msm_isp_buf_mgr *buf_mgr, 
	return rc;

}



static int msm_isp_buf_unprepare(struct msm_isp_buf_mgr *buf_mgr,

	uint32_t buf_handle, int32_t buf_idx)

{

	struct msm_isp_bufq *bufq = NULL;

	struct msm_isp_buffer *buf_info = NULL;

	bufq = msm_isp_get_bufq(buf_mgr, buf_handle);

	if (!bufq) {

		pr_err("%s: Invalid bufq\n", __func__);

		return -EINVAL;

	}



	buf_info = msm_isp_get_buf_ptr(buf_mgr, buf_handle, buf_idx);

	if (!buf_info) {

		pr_err("%s: buf not found\n", __func__);

		return -EINVAL;

	}

	if (buf_info->state == MSM_ISP_BUFFER_STATE_UNUSED ||

			buf_info->state == MSM_ISP_BUFFER_STATE_INITIALIZED)

		return 0;



	if (MSM_ISP_BUFFER_SRC_HAL == BUF_SRC(bufq->stream_id)) {

		if (buf_info->state == MSM_ISP_BUFFER_STATE_DEQUEUED ||

		buf_info->state == MSM_ISP_BUFFER_STATE_DIVERTED)

			buf_mgr->vb2_ops->put_buf(buf_info->vb2_buf,

				bufq->session_id, bufq->stream_id);

	}

	msm_isp_unprepare_v4l2_buf(buf_mgr, buf_info);



	return 0;

}



static int msm_isp_get_buf(struct msm_isp_buf_mgr *buf_mgr, uint32_t id,

	uint32_t bufq_handle, struct msm_isp_buffer **buf_info)
@@ -476,6 +506,18 @@ static int msm_isp_get_buf(struct msm_isp_buf_mgr *buf_mgr, uint32_t id, 
					__func__, vb2_buf->v4l2_buf.index);

				rc = -EINVAL;

			}

			if ((*buf_info) == NULL) {

				buf_mgr->vb2_ops->put_buf(vb2_buf,

					bufq->session_id, bufq->stream_id);

				pr_err("%s: buf index %d not found!\n",

					__func__, vb2_buf->v4l2_buf.index);

				rc = -EINVAL;



			}

		} else {

			pr_err("%s: No Buffer session_id: %d stream_id: %d\n",

				__func__, bufq->session_id, bufq->stream_id);

			rc = -EINVAL;

		}

		break;

	case MSM_ISP_BUFFER_SRC_SCRATCH:
@@ -868,6 +910,30 @@ static int msm_isp_buf_enqueue(struct msm_isp_buf_mgr *buf_mgr, 
	return rc;

}



static int msm_isp_buf_dequeue(struct msm_isp_buf_mgr *buf_mgr,

	struct msm_isp_qbuf_info *info)

{

	struct msm_isp_buffer *buf_info = NULL;

	int rc = 0;



	buf_info = msm_isp_get_buf_ptr(buf_mgr, info->handle, info->buf_idx);

	if (!buf_info) {

		pr_err("Invalid buffer dequeue\n");

		return -EINVAL;

	}



	if (buf_info->state == MSM_ISP_BUFFER_STATE_DEQUEUED ||

		buf_info->state == MSM_ISP_BUFFER_STATE_DIVERTED) {

		pr_err("%s: Invalid state %d\n", __func__, buf_info->state);

		return -EINVAL;

	}

	msm_isp_buf_unprepare(buf_mgr, info->handle, info->buf_idx);



	buf_info->state = MSM_ISP_BUFFER_STATE_INITIALIZED;



	return rc;

}



static int msm_isp_get_bufq_handle(struct msm_isp_buf_mgr *buf_mgr,

	uint32_t session_id, uint32_t stream_id)

{
@@ -965,7 +1031,7 @@ static int msm_isp_release_bufq(struct msm_isp_buf_mgr *buf_mgr, 
		return rc;

	}



	msm_isp_buf_unprepare(buf_mgr, bufq_handle);

	msm_isp_buf_unprepare_all(buf_mgr, bufq_handle);



	kfree(bufq->bufs);

	msm_isp_free_buf_handle(buf_mgr, bufq_handle);
@@ -982,7 +1048,7 @@ static void msm_isp_release_all_bufq( 
		bufq = &buf_mgr->bufq[i];

		if (!bufq->bufq_handle)

			continue;

		msm_isp_buf_unprepare(buf_mgr, bufq->bufq_handle);

		msm_isp_buf_unprepare_all(buf_mgr, bufq->bufq_handle);



		kfree(bufq->bufs);

		msm_isp_free_buf_handle(buf_mgr, bufq->bufq_handle);
@@ -1175,6 +1241,11 @@ int msm_isp_proc_buf_cmd(struct msm_isp_buf_mgr *buf_mgr, 
		buf_mgr->ops->enqueue_buf(buf_mgr, qbuf_info);

		break;

	}

	case VIDIOC_MSM_ISP_DEQUEUE_BUF: {

		struct msm_isp_qbuf_info *qbuf_info = arg;

		buf_mgr->ops->dequeue_buf(buf_mgr, qbuf_info);

		break;

	}

	case VIDIOC_MSM_ISP_RELEASE_BUF: {

		struct msm_isp_buf_request *buf_req = arg;

		buf_mgr->ops->release_buf(buf_mgr, buf_req->handle);
@@ -1239,6 +1310,7 @@ static int msm_isp_buf_mgr_debug(struct msm_isp_buf_mgr *buf_mgr) 
static struct msm_isp_buf_ops isp_buf_ops = {

	.request_buf = msm_isp_request_bufq,

	.enqueue_buf = msm_isp_buf_enqueue,

	.dequeue_buf = msm_isp_buf_dequeue,

	.release_buf = msm_isp_release_bufq,

	.get_bufq_handle = msm_isp_get_bufq_handle,

	.get_buf_src = msm_isp_get_buf_src,

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

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ struct msm_isp_buf_ops { 
	int (*enqueue_buf) (struct msm_isp_buf_mgr *buf_mgr,

		struct msm_isp_qbuf_info *info);



	int (*dequeue_buf)(struct msm_isp_buf_mgr *buf_mgr,

		struct msm_isp_qbuf_info *info);



	int (*release_buf) (struct msm_isp_buf_mgr *buf_mgr,

		uint32_t bufq_handle);

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

+4 −0
Original line number Diff line number Diff line
@@ -743,7 +743,11 @@ static long msm_isp_ioctl_unlocked(struct v4l2_subdev *sd, 
		break;

	}

	case VIDIOC_MSM_ISP_REQUEST_BUF:

		/* fallthrough */

	case VIDIOC_MSM_ISP_ENQUEUE_BUF:

		/* fallthrough */

	case VIDIOC_MSM_ISP_DEQUEUE_BUF:

		/* fallthrough */

	case VIDIOC_MSM_ISP_RELEASE_BUF: {

		mutex_lock(&vfe_dev->buf_mgr_mutex);

		rc = msm_isp_proc_buf_cmd(vfe_dev->buf_mgr, cmd, arg);

include/media/msmb_isp.h

+3 −0
Original line number Diff line number Diff line
@@ -649,4 +649,7 @@ struct msm_isp_event_data { 
#define VIDIOC_MSM_ISP_FETCH_ENG_START \

	_IOWR('V', BASE_VIDIOC_PRIVATE+20, struct msm_vfe_fetch_eng_start)



#define VIDIOC_MSM_ISP_DEQUEUE_BUF \

	_IOWR('V', BASE_VIDIOC_PRIVATE+21, struct msm_isp_qbuf_info)



#endif /* __MSMB_ISP__ */