From 0a5b6eea31125897a15ec2d1851eed8d8fc4e7f3 Mon Sep 17 00:00:00 2001 From: Balamurugan Alagarsamy Date: Thu, 14 Aug 2014 16:33:19 +0530 Subject: [PATCH] v4l2: vb2: replace VIDEO_MAX_FRAME with VB2_MAX_FRAME - vb2 drivers to rely on VB2_MAX_FRAME. - VB2_MAX_FRAME bumps the value to 64 from current 32 Change-Id: I3d7998898df43553486166c44b54524aac449deb Signed-off-by: Balamurugan Alagarsamy --- drivers/media/video/mem2mem_testdev.c | 2 +- drivers/media/video/saa7134/saa7134-ts.c | 4 ++-- drivers/media/video/saa7134/saa7134-vbi.c | 4 ++-- drivers/media/video/saa7134/saa7134-video.c | 2 +- drivers/media/video/videobuf2-core.c | 8 ++++---- include/media/videobuf2-core.h | 4 +++- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/video/mem2mem_testdev.c index 12897e8a331..fd5c96bd048 100644 --- a/drivers/media/video/mem2mem_testdev.c +++ b/drivers/media/video/mem2mem_testdev.c @@ -49,7 +49,7 @@ MODULE_VERSION("0.1.1"); #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) diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c index 2e3f4b412d8..851768ae2a6 100644 --- a/drivers/media/video/saa7134/saa7134-ts.c +++ b/drivers/media/video/saa7134/saa7134-ts.c @@ -197,8 +197,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) diff --git a/drivers/media/video/saa7134/saa7134-vbi.c b/drivers/media/video/saa7134/saa7134-vbi.c index e9aa94b807f..370292859e0 100644 --- a/drivers/media/video/saa7134/saa7134-vbi.c +++ b/drivers/media/video/saa7134/saa7134-vbi.c @@ -214,8 +214,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; } diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 417034eb6ad..e63ffdacd69 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c @@ -2509,7 +2509,7 @@ struct video_device saa7134_radio_template = { int saa7134_video_init1(struct saa7134_dev *dev) { /* sanitycheck insmod options */ - if (gbuffers < 2 || gbuffers > VIDEO_MAX_FRAME) + if (gbuffers < 2 || gbuffers > VB2_MAX_FRAME) gbuffers = 2; if (gbufsize < 0 || gbufsize > gbufsize_max) gbufsize = gbufsize_max; diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index 6cea21860a2..ae544a42054 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -536,7 +536,7 @@ int vb2_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); memset(q->plane_sizes, 0, sizeof(q->plane_sizes)); memset(q->alloc_ctx, 0, sizeof(q->alloc_ctx)); q->memory = req->memory; @@ -644,7 +644,7 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create) return -EINVAL; } - if (q->num_buffers == VIDEO_MAX_FRAME) { + if (q->num_buffers == VB2_MAX_FRAME) { dprintk(1, "%s(): maximum number of buffers already allocated\n", __func__); return -ENOBUFS; @@ -658,7 +658,7 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create) q->memory = create->memory; } - 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 @@ -1774,7 +1774,7 @@ struct vb2_fileio_buf { struct vb2_fileio_data { struct v4l2_requestbuffers req; struct v4l2_buffer b; - struct vb2_fileio_buf bufs[VIDEO_MAX_FRAME]; + struct vb2_fileio_buf bufs[VB2_MAX_FRAME]; unsigned int index; unsigned int q_count; unsigned int dq_count; diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index a15d1f1b319..b0b6b04f61d 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -17,6 +17,8 @@ #include #include +#define VB2_MAX_FRAME 64 + struct vb2_alloc_ctx; struct vb2_fileio_data; @@ -281,7 +283,7 @@ struct vb2_queue { /* private: internal use only */ enum v4l2_memory memory; - struct vb2_buffer *bufs[VIDEO_MAX_FRAME]; + struct vb2_buffer *bufs[VB2_MAX_FRAME]; unsigned int num_buffers; struct list_head queued_list;