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

Commit 7041bc99 authored by Prabhakar Lad's avatar Prabhakar Lad Committed by Mauro Carvalho Chehab
Browse files

[media] media: davinci: vpbe: add support for VIDIOC_CREATE_BUFS 



this patch adds support for vidioc_create_bufs. Along side
remove unneeded member numbuffers.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 02f9cf96

drivers/media/platform/davinci/vpbe_display.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -244,12 +244,15 @@ vpbe_buffer_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt, 




	v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "vpbe_buffer_setup\n");

	v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "vpbe_buffer_setup\n");





	if (fmt && fmt->fmt.pix.sizeimage < layer->pix_fmt.sizeimage)

		return -EINVAL;



	/* Store number of buffers allocated in numbuffer member */

	/* Store number of buffers allocated in numbuffer member */

	if (*nbuffers < VPBE_DEFAULT_NUM_BUFS)

	if (vq->num_buffers + *nbuffers < VPBE_DEFAULT_NUM_BUFS)

		*nbuffers = layer->numbuffers = VPBE_DEFAULT_NUM_BUFS;

		*nbuffers = VPBE_DEFAULT_NUM_BUFS - vq->num_buffers;





	*nplanes = 1;

	*nplanes = 1;

	sizes[0] = layer->pix_fmt.sizeimage;

	sizes[0] = fmt ? fmt->fmt.pix.sizeimage : layer->pix_fmt.sizeimage;

	alloc_ctxs[0] = layer->alloc_ctx;

	alloc_ctxs[0] = layer->alloc_ctx;





	return 0;

	return 0;
@@ -1241,6 +1244,7 @@ static const struct v4l2_ioctl_ops vpbe_ioctl_ops = { 
	.vidioc_try_fmt_vid_out  = vpbe_display_try_fmt,

	.vidioc_try_fmt_vid_out  = vpbe_display_try_fmt,





	.vidioc_reqbufs		 = vb2_ioctl_reqbufs,

	.vidioc_reqbufs		 = vb2_ioctl_reqbufs,

	.vidioc_create_bufs	 = vb2_ioctl_create_bufs,

	.vidioc_querybuf	 = vb2_ioctl_querybuf,

	.vidioc_querybuf	 = vb2_ioctl_querybuf,

	.vidioc_qbuf		 = vb2_ioctl_qbuf,

	.vidioc_qbuf		 = vb2_ioctl_qbuf,

	.vidioc_dqbuf		 = vb2_ioctl_dqbuf,

	.vidioc_dqbuf		 = vb2_ioctl_dqbuf,

include/media/davinci/vpbe_display.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -70,8 +70,6 @@ struct vpbe_disp_buffer { 




/* vpbe display object structure */

/* vpbe display object structure */

struct vpbe_layer {

struct vpbe_layer {

	/* number of buffers in fbuffers */

	unsigned int numbuffers;

	/* Pointer to the vpbe_display */

	/* Pointer to the vpbe_display */

	struct vpbe_display *disp_dev;

	struct vpbe_display *disp_dev;

	/* Pointer pointing to current v4l2_buffer */

	/* Pointer pointing to current v4l2_buffer */