summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/vim2m.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2015-06-05 11:28:52 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-06-09 17:27:38 -0300
commit7bcff1c242475ffc47e413ac7b1d7a3e3529b109 (patch)
tree20b22a3c751dca5a8f6f5b4f5bdd6cc061d70064 /drivers/media/platform/vim2m.c
parente68cf471e71d1e91c5661e1bb7595985158d59ae (diff)
downloadop-kernel-dev-7bcff1c242475ffc47e413ac7b1d7a3e3529b109.zip
op-kernel-dev-7bcff1c242475ffc47e413ac7b1d7a3e3529b109.tar.gz
[media] vim2m: add create_bufs and prepare_buf support
Add support for the missing VIDIOC_CREATE_BUFS and VIDIOC_PREPARE_BUF ioctls. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/vim2m.c')
-rw-r--r--drivers/media/platform/vim2m.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c
index cecfd75..295fde5 100644
--- a/drivers/media/platform/vim2m.c
+++ b/drivers/media/platform/vim2m.c
@@ -693,6 +693,8 @@ static const struct v4l2_ioctl_ops vim2m_ioctl_ops = {
.vidioc_querybuf = v4l2_m2m_ioctl_querybuf,
.vidioc_qbuf = v4l2_m2m_ioctl_qbuf,
.vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf,
+ .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf,
+ .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs,
.vidioc_expbuf = v4l2_m2m_ioctl_expbuf,
.vidioc_streamon = v4l2_m2m_ioctl_streamon,
@@ -720,6 +722,12 @@ static int vim2m_queue_setup(struct vb2_queue *vq,
size = q_data->width * q_data->height * q_data->fmt->depth >> 3;
+ if (fmt) {
+ if (fmt->fmt.pix.sizeimage < size)
+ return -EINVAL;
+ size = fmt->fmt.pix.sizeimage;
+ }
+
while (size * count > MEM2MEM_VID_MEM_LIMIT)
(count)--;
OpenPOWER on IntegriCloud