Commit 2f241950 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Hans Verkuil
Browse files

media: v4l2: Add mem2mem helpers for REMOVE_BUFS ioctl 



Create v4l2-mem2mem helpers for VIDIOC_REMOVE_BUFS ioctl and
make test drivers use it.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent a3293a85

drivers/media/test-drivers/vicodec/vicodec-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1345,6 +1345,7 @@ static const struct v4l2_ioctl_ops vicodec_ioctl_ops = { 
	.vidioc_prepare_buf	= v4l2_m2m_ioctl_prepare_buf,

	.vidioc_create_bufs	= v4l2_m2m_ioctl_create_bufs,

	.vidioc_expbuf		= v4l2_m2m_ioctl_expbuf,

	.vidioc_remove_bufs	= v4l2_m2m_ioctl_remove_bufs,



	.vidioc_streamon	= v4l2_m2m_ioctl_streamon,

	.vidioc_streamoff	= v4l2_m2m_ioctl_streamoff,

drivers/media/test-drivers/vimc/vimc-capture.c

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static const struct v4l2_ioctl_ops vimc_capture_ioctl_ops = { 
	.vidioc_expbuf = vb2_ioctl_expbuf,

	.vidioc_streamon = vb2_ioctl_streamon,

	.vidioc_streamoff = vb2_ioctl_streamoff,

	.vidioc_remove_bufs = vb2_ioctl_remove_bufs,

};



static void vimc_capture_return_all_buffers(struct vimc_capture_device *vcapture,

drivers/media/test-drivers/visl/visl-video.c

+1 −0
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ const struct v4l2_ioctl_ops visl_ioctl_ops = { 
	.vidioc_prepare_buf		= v4l2_m2m_ioctl_prepare_buf,

	.vidioc_create_bufs		= v4l2_m2m_ioctl_create_bufs,

	.vidioc_expbuf			= v4l2_m2m_ioctl_expbuf,

	.vidioc_remove_bufs		= v4l2_m2m_ioctl_remove_bufs,



	.vidioc_streamon		= v4l2_m2m_ioctl_streamon,

	.vidioc_streamoff		= v4l2_m2m_ioctl_streamoff,

drivers/media/test-drivers/vivid/vivid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -769,6 +769,7 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops = { 
	.vidioc_expbuf			= vb2_ioctl_expbuf,

	.vidioc_streamon		= vb2_ioctl_streamon,

	.vidioc_streamoff		= vb2_ioctl_streamoff,

	.vidioc_remove_bufs		= vb2_ioctl_remove_bufs,



	.vidioc_enum_input		= vivid_enum_input,

	.vidioc_g_input			= vivid_g_input,

drivers/media/v4l2-core/v4l2-mem2mem.c

+15 −0
Original line number Diff line number Diff line
@@ -1386,6 +1386,21 @@ int v4l2_m2m_ioctl_create_bufs(struct file *file, void *priv, 
}

EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_create_bufs);



int v4l2_m2m_ioctl_remove_bufs(struct file *file, void *priv,

			       struct v4l2_remove_buffers *remove)

{

	struct v4l2_fh *fh = file->private_data;

	struct vb2_queue *q = v4l2_m2m_get_vq(fh->m2m_ctx, remove->type);



	if (!q)

		return -EINVAL;

	if (q->type != remove->type)

		return -EINVAL;



	return vb2_core_remove_bufs(q, remove->index, remove->count);

}

EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_remove_bufs);



int v4l2_m2m_ioctl_querybuf(struct file *file, void *priv,

				struct v4l2_buffer *buf)

{