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

Commit b8dd2d56 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "v4l2: vb2: replace VIDEO_MAX_FRAME with VB2_MAX_FRAME"

parents 0159c368 1b1d1943

drivers/media/pci/saa7134/saa7134-ts.c

+2 −2
Original line number Diff line number Diff line
@@ -227,8 +227,8 @@ int saa7134_ts_init1(struct saa7134_dev *dev) 
	/* sanitycheck insmod options */

	if (tsbufs < 2)

		tsbufs = 2;

	if (tsbufs > VIDEO_MAX_FRAME)

		tsbufs = VIDEO_MAX_FRAME;

	if (tsbufs > VB2_MAX_FRAME)

		tsbufs = VB2_MAX_FRAME;

	if (ts_nr_packets < 4)

		ts_nr_packets = 4;

	if (ts_nr_packets > 312)

drivers/media/pci/saa7134/saa7134-vbi.c

+2 −2
Original line number Diff line number Diff line
@@ -203,8 +203,8 @@ int saa7134_vbi_init1(struct saa7134_dev *dev) 


	if (vbibufs < 2)

		vbibufs = 2;

	if (vbibufs > VIDEO_MAX_FRAME)

		vbibufs = VIDEO_MAX_FRAME;

	if (vbibufs > VB2_MAX_FRAME)

		vbibufs = VB2_MAX_FRAME;

	return 0;

}

drivers/media/pci/saa7134/saa7134-video.c

+1 −1
Original line number Diff line number Diff line
@@ -2030,7 +2030,7 @@ int saa7134_video_init1(struct saa7134_dev *dev) 
	int ret;



	/* sanitycheck insmod options */

	if (gbuffers < 2 || gbuffers > VIDEO_MAX_FRAME)

	if (gbuffers < 2 || gbuffers > VB2_MAX_FRAME)

		gbuffers = 2;

	if (gbufsize > gbufsize_max)

		gbufsize = gbufsize_max;

drivers/media/platform/mem2mem_testdev.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ MODULE_PARM_DESC(debug, "activates debug info"); 
#define MEM2MEM_NAME		"m2m-testdev"



/* Per queue */

#define MEM2MEM_DEF_NUM_BUFS	VIDEO_MAX_FRAME

#define MEM2MEM_DEF_NUM_BUFS	VB2_MAX_FRAME

/* In bytes, per queue */

#define MEM2MEM_VID_MEM_LIMIT	(16 * 1024 * 1024)

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

+4 −4
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ static int __reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req) 
	/*

	 * Make sure the requested values and current defaults are sane.

	 */

	num_buffers = min_t(unsigned int, req->count, VIDEO_MAX_FRAME);

	num_buffers = min_t(unsigned int, req->count, VB2_MAX_FRAME);

	num_buffers = max_t(unsigned int, num_buffers, q->min_buffers_needed);

	memset(q->plane_sizes, 0, sizeof(q->plane_sizes));

	memset(q->alloc_ctx, 0, sizeof(q->alloc_ctx));
@@ -1012,7 +1012,7 @@ static int __create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create 
	unsigned int num_planes = 0, num_buffers, allocated_buffers;

	int ret;



	if (q->num_buffers == VIDEO_MAX_FRAME) {

	if (q->num_buffers == VB2_MAX_FRAME) {

		dprintk(1, "maximum number of buffers already allocated\n");

		return -ENOBUFS;

	}
@@ -1024,7 +1024,7 @@ static int __create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create 
		q->waiting_for_buffers = !V4L2_TYPE_IS_OUTPUT(q->type);

	}



	num_buffers = min(create->count, VIDEO_MAX_FRAME - q->num_buffers);

	num_buffers = min(create->count, VB2_MAX_FRAME - q->num_buffers);



	/*

	 * Ask the driver, whether the requested number of buffers, planes per
@@ -2740,7 +2740,7 @@ struct vb2_fileio_data { 
	struct v4l2_requestbuffers req;

	struct v4l2_plane p;

	struct v4l2_buffer b;

	struct vb2_fileio_buf bufs[VIDEO_MAX_FRAME];

	struct vb2_fileio_buf bufs[VB2_MAX_FRAME];

	unsigned int cur_index;

	unsigned int initial_index;

	unsigned int q_count;