Merge branch 'master' of goat:git/vdummy

[vdummy] / vdummy.c

diff --git a/vdummy.c b/vdummy.c
index 565a6b8..b434b6f 100644 (file)
--- a/vdummy.c
+++ b/vdummy.c
@@ -7,7 +7,6 @@
 #include <linux/ktime.h>
 #include <asm/uaccess.h>
 #include <linux/videodev2.h>
-#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
@@ -25,6 +24,7 @@ static void shutdown(void);
 
 static int ioctl_querycap(struct file *file, void *fh, struct v4l2_capability *cap);
 static int ioctl_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *fdesc);
+static int ioctl_enum_framesz(struct file *file, void *fh, struct v4l2_frmsizeenum *fsz);
 static int ioctl_get_fmt(struct file *file, void *fh, struct v4l2_format *fmt);
 static int ioctl_set_fmt(struct file *file, void *fh, struct v4l2_format *fmt);
 static int ioctl_try_fmt(struct file *file, void *fh, struct v4l2_format *fmt);
@@ -33,7 +33,7 @@ static int ioctl_set_parm(struct file *file, void *fh, struct v4l2_streamparm *f
 static int ioctl_queryctl(struct file *file, void *fh, struct v4l2_queryctrl *ctl);
 
 static int queue_setup(struct vb2_queue *vbq, unsigned int *nbuf,
-               unsigned int *nplanes, unsigned int *sizes, void **alloc_ctx);
+               unsigned int *nplanes, unsigned int *sizes, struct device **alloc_ctx);
 static int buf_prepare(struct vb2_buffer *vb);
 static void buf_queue(struct vb2_buffer *vb);
 static int start_streaming(struct vb2_queue *vbq, unsigned int count);
@@ -132,6 +132,7 @@ static int init(void)
 
        iops.vidioc_querycap = ioctl_querycap;
        iops.vidioc_enum_fmt_vid_cap = ioctl_enum_fmt;
+       iops.vidioc_enum_framesizes = ioctl_enum_framesz;
        iops.vidioc_g_fmt_vid_cap = ioctl_get_fmt;
        iops.vidioc_s_fmt_vid_cap = ioctl_set_fmt;
        iops.vidioc_try_fmt_vid_cap = ioctl_try_fmt;
@@ -200,6 +201,18 @@ static int ioctl_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *fdes
        return 0;
 }
 
+static int ioctl_enum_framesz(struct file *file, void *fh, struct v4l2_frmsizeenum *fsz)
+{
+       if(fsz->index != 0) {
+               return -EINVAL;
+       }
+       fsz->type = V4L2_FRMSIZE_TYPE_CONTINUOUS;
+       fsz->stepwise.min_width = fsz->stepwise.min_height = 1;
+       fsz->stepwise.max_width = fsz->stepwise.max_height = 8192;
+       fsz->stepwise.step_width = fsz->stepwise.step_height = 1;
+       return 0;
+}
+
 static int ioctl_get_fmt(struct file *file, void *fh, struct v4l2_format *fmt)
 {
        if(fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
@@ -288,7 +301,7 @@ static int ioctl_queryctl(struct file *file, void *fh, struct v4l2_queryctrl *ct
 }
 
 static int queue_setup(struct vb2_queue *vbq, unsigned int *nbuf,
-               unsigned int *nplanes, unsigned int *sizes, void **alloc_ctx)
+               unsigned int *nplanes, unsigned int *sizes, struct device **alloc_ctx)
 {
        if(vbq->num_buffers + *nbuf < 2) {
                *nbuf = 2 - vbq->num_buffers;
@@ -411,19 +424,19 @@ static int update_frame(int xsz, int ysz)
 static int gen_frame(void)
 {
        struct buffer *buf = 0;
+       unsigned long flags;
 
        printk(KERN_INFO "vdummy: gen_frame\n");
 
-       spin_lock(&blist_lock);
+       spin_lock_irqsave(&blist_lock, flags);
        if(buflist) {
                buf = buflist;
                buflist = buflist->next;
                if(!buflist) buflist_tail = 0;
        }
-       spin_unlock(&blist_lock);
+       spin_unlock_irqrestore(&blist_lock, flags);
 
        if(buf) {
-               mutex_lock(&mutex);
                memcpy(vb2_plane_vaddr(&buf->vb.vb2_buf, 0), frame, frame_size);
 
                buf->vb.vb2_buf.timestamp = ktime_get_ns();
@@ -433,7 +446,6 @@ static int gen_frame(void)
                buf->vb.field = V4L2_FIELD_NONE;
                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
                vb2_set_plane_payload(&buf->vb.vb2_buf, 0, frame_size);
-               mutex_unlock(&mutex);
        }
        return 0;
 }