rubenslte/android_kernel_samsung_msm8226-rubenslte
1
Fork 0
forked from rubenslte/android_kernel_samsung_msm8226
Code Pull Requests Activity

v4l2: vb2: replace VIDEO_MAX_FRAME with VB2_MAX_FRAME

Browse Source 
- 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 <balaga@codeaurora.org>
This commit is contained in:
Balamurugan Alagarsamy
2014-08-18 10:49:49 +05:30
committed by Maheshwar Ajja
parent 47457d583a
commit 0a5b6eea31
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/video/mem2mem_testdev.c
+1 -1
View File
@@ -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)
drivers/media/video/saa7134/saa7134-ts.c
+2 -2
View File
@@ -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)
drivers/media/video/saa7134/saa7134-vbi.c
+2 -2
View File
@@ -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;
}
drivers/media/video/saa7134/saa7134-video.c
+1 -1
View File
@@ -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;
drivers/media/video/videobuf2-core.c
+4 -4
View File
@@ -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;
include/media/videobuf2-core.h
+3 -1
View File
@@ -17,6 +17,8 @@
#include <linux/poll.h>
#include <linux/videodev2.h>
#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;