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

Commit 171fe6d1 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[media] media: davinci_vpfe: set minimum required buffers to three 



this patch sets nbuffers to three or more and drops the
unset member video_limit which just a copy paste from
earlier driver.

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 694f9963

drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h

+0 −2
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ struct vpfe_device { 
	/* CCDC IRQs used when CCDC/ISIF output to SDRAM */

	unsigned int			ccdc_irq0;

	unsigned int			ccdc_irq1;

	/* maximum video memory that is available*/

	unsigned int			video_limit;

	/* media device */

	struct media_device		media_dev;

	/* ccdc subdevice */

drivers/staging/media/davinci_vpfe/vpfe_video.c

+3 −12
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ 
#include "vpfe.h"

#include "vpfe_mc_capture.h"



/* minimum number of buffers needed in cont-mode */

#define MIN_NUM_BUFFERS			3



static int debug;



/* get v4l2 subdev pointer to external subdev which is active */
@@ -1088,20 +1085,14 @@ vpfe_buffer_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt, 
	struct vpfe_fh *fh = vb2_get_drv_priv(vq);

	struct vpfe_video_device *video = fh->video;

	struct vpfe_device *vpfe_dev = video->vpfe_dev;

	struct vpfe_pipeline *pipe = &video->pipe;

	unsigned long size;



	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_buffer_queue_setup\n");

	size = video->fmt.fmt.pix.sizeimage;



	if (vpfe_dev->video_limit) {

		while (size * *nbuffers > vpfe_dev->video_limit)

			(*nbuffers)--;

	}

	if (pipe->state == VPFE_PIPELINE_STREAM_CONTINUOUS) {

		if (*nbuffers < MIN_NUM_BUFFERS)

			*nbuffers = MIN_NUM_BUFFERS;

	}

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

		*nbuffers = 3 - vq->num_buffers;



	*nplanes = 1;

	sizes[0] = size;

	alloc_ctxs[0] = video->alloc_ctx;