mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[media] media: videobuf2: Restructure vb2_buffer 

Remove v4l2 stuff - v4l2_buf, v4l2_plane - from struct vb2_buffer.

Add new member variables - bytesused, length, offset, userptr, fd,
data_offset - to struct vb2_plane in order to cover all information
of v4l2_plane.
struct vb2_plane {
        <snip>
        unsigned int            bytesused;
        unsigned int            length;
        union {
                unsigned int    offset;
                unsigned long   userptr;
                int             fd;
        } m;
        unsigned int            data_offset;
}

Replace v4l2_buf with new member variables - index, type, memory - which
are common fields for buffer management.
struct vb2_buffer {
        <snip>
        unsigned int            index;
        unsigned int            type;
        unsigned int            memory;
        unsigned int            num_planes;
        struct vb2_plane        planes[VIDEO_MAX_PLANES];
        <snip>
};

v4l2 specific fields - flags, field, timestamp, timecode,
sequence - are moved to vb2_v4l2_buffer in videobuf2-v4l2.c
struct vb2_v4l2_buffer {
        struct vb2_buffer       vb2_buf;

        __u32                   flags;
        __u32                   field;
        struct timeval          timestamp;
        struct v4l2_timecode    timecode;
        __u32                   sequence;
};

Signed-off-by: Junghak Sung <jh1009.sung@samsung.com>
Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Junghak Sung 2015-09-22 10:30:30 -03:00 committed by Mauro Carvalho Chehab
parent c139990e84
commit 2d7007153f
137 changed files with 1647 additions and 1263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/input/touchscreen/sur40.c
View File

@ -38,6 +38,7 @@
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-dev.h> #include <media/v4l2-dev.h>
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-dma-sg.h> #include <media/videobuf2-dma-sg.h>
/* read 512 bytes from endpoint 0x86 -> get header + blobs */ /* read 512 bytes from endpoint 0x86 -> get header + blobs */
@ -163,7 +164,7 @@ struct sur40_state {
}; };
struct sur40_buffer { struct sur40_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };
@ -420,7 +421,7 @@ static void sur40_process_video(struct sur40_state *sur40)
dev_dbg(sur40->dev, "header acquired\n"); dev_dbg(sur40->dev, "header acquired\n");
sgt = vb2_dma_sg_plane_desc(&new_buf->vb, 0); sgt = vb2_dma_sg_plane_desc(&new_buf->vb.vb2_buf, 0);
result = usb_sg_init(&sgr, sur40->usbdev, result = usb_sg_init(&sgr, sur40->usbdev,
usb_rcvbulkpipe(sur40->usbdev, VIDEO_ENDPOINT), 0, usb_rcvbulkpipe(sur40->usbdev, VIDEO_ENDPOINT), 0,
@ -443,15 +444,15 @@ static void sur40_process_video(struct sur40_state *sur40)
goto err_poll; goto err_poll;
/* mark as finished */ /* mark as finished */
v4l2_get_timestamp(&new_buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&new_buf->vb.timestamp);
new_buf->vb.v4l2_buf.sequence = sur40->sequence++; new_buf->vb.sequence = sur40->sequence++;
new_buf->vb.v4l2_buf.field = V4L2_FIELD_NONE; new_buf->vb.field = V4L2_FIELD_NONE;
vb2_buffer_done(&new_buf->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&new_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
dev_dbg(sur40->dev, "buffer marked done\n"); dev_dbg(sur40->dev, "buffer marked done\n");
return; return;
err_poll: err_poll:
vb2_buffer_done(&new_buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&new_buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
/* Initialize input device parameters. */ /* Initialize input device parameters. */
@ -701,7 +702,7 @@ static void return_all_buffers(struct sur40_state *sur40,
spin_lock(&sur40->qlock); spin_lock(&sur40->qlock);
list_for_each_entry_safe(buf, node, &sur40->buf_list, list) { list_for_each_entry_safe(buf, node, &sur40->buf_list, list) {
vb2_buffer_done(&buf->vb, state); vb2_buffer_done(&buf->vb.vb2_buf, state);
list_del(&buf->list); list_del(&buf->list);
} }
spin_unlock(&sur40->qlock); spin_unlock(&sur40->qlock);

21
drivers/media/dvb-frontends/rtl2832_sdr.c
View File

@ -29,6 +29,7 @@
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include <media/v4l2-ctrls.h> #include <media/v4l2-ctrls.h>
#include <media/v4l2-event.h> #include <media/v4l2-event.h>
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-vmalloc.h> #include <media/videobuf2-vmalloc.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
@ -107,7 +108,8 @@ static const unsigned int NUM_FORMATS = ARRAY_SIZE(formats);
/* intermediate buffers with raw data from the USB device */ /* intermediate buffers with raw data from the USB device */
struct rtl2832_sdr_frame_buf { struct rtl2832_sdr_frame_buf {
struct vb2_buffer vb; /* common v4l buffer stuff -- must be first */ /* common v4l buffer stuff -- must be first */
struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };
@ -304,13 +306,13 @@ static void rtl2832_sdr_urb_complete(struct urb *urb)
} }
/* fill framebuffer */ /* fill framebuffer */
ptr = vb2_plane_vaddr(&fbuf->vb, 0); ptr = vb2_plane_vaddr(&fbuf->vb.vb2_buf, 0);
len = rtl2832_sdr_convert_stream(dev, ptr, urb->transfer_buffer, len = rtl2832_sdr_convert_stream(dev, ptr, urb->transfer_buffer,
urb->actual_length); urb->actual_length);
vb2_set_plane_payload(&fbuf->vb, 0, len); vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0, len);
v4l2_get_timestamp(&fbuf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&fbuf->vb.timestamp);
fbuf->vb.v4l2_buf.sequence = dev->sequence++; fbuf->vb.sequence = dev->sequence++;
vb2_buffer_done(&fbuf->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&fbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
} }
skip: skip:
usb_submit_urb(urb, GFP_ATOMIC); usb_submit_urb(urb, GFP_ATOMIC);
@ -464,7 +466,7 @@ static void rtl2832_sdr_cleanup_queued_bufs(struct rtl2832_sdr_dev *dev)
buf = list_entry(dev->queued_bufs.next, buf = list_entry(dev->queued_bufs.next,
struct rtl2832_sdr_frame_buf, list); struct rtl2832_sdr_frame_buf, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&dev->queued_bufs_lock, flags); spin_unlock_irqrestore(&dev->queued_bufs_lock, flags);
} }
@ -518,14 +520,15 @@ static int rtl2832_sdr_buf_prepare(struct vb2_buffer *vb)
static void rtl2832_sdr_buf_queue(struct vb2_buffer *vb) static void rtl2832_sdr_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct rtl2832_sdr_dev *dev = vb2_get_drv_priv(vb->vb2_queue); struct rtl2832_sdr_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
struct rtl2832_sdr_frame_buf *buf = struct rtl2832_sdr_frame_buf *buf =
container_of(vb, struct rtl2832_sdr_frame_buf, vb); container_of(vbuf, struct rtl2832_sdr_frame_buf, vb);
unsigned long flags; unsigned long flags;
/* Check the device has not disconnected between prep and queuing */ /* Check the device has not disconnected between prep and queuing */
if (!dev->udev) { if (!dev->udev) {
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
return; return;
} }

6
drivers/media/pci/cobalt/cobalt-driver.h
View File

@ -35,6 +35,7 @@
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-fh.h> #include <media/v4l2-fh.h>
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-dma-sg.h> #include <media/videobuf2-dma-sg.h>
#include "m00233_video_measure_memmap_package.h" #include "m00233_video_measure_memmap_package.h"
@ -206,11 +207,12 @@ struct sg_dma_desc_info {
#define COBALT_STREAM_FL_ADV_IRQ 1 #define COBALT_STREAM_FL_ADV_IRQ 1
struct cobalt_buffer { struct cobalt_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };
static inline struct cobalt_buffer *to_cobalt_buffer(struct vb2_buffer *vb2) static inline
struct cobalt_buffer *to_cobalt_buffer(struct vb2_v4l2_buffer *vb2)
{ {
return container_of(vb2, struct cobalt_buffer, vb); return container_of(vb2, struct cobalt_buffer, vb);
} }

7
drivers/media/pci/cobalt/cobalt-irq.c
View File

@ -134,11 +134,12 @@ done:
skip = true; skip = true;
s->skip_first_frames--; s->skip_first_frames--;
} }
v4l2_get_timestamp(&cb->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&cb->vb.timestamp);
/* TODO: the sequence number should be read from the FPGA so we /* TODO: the sequence number should be read from the FPGA so we
also know about dropped frames. */ also know about dropped frames. */
cb->vb.v4l2_buf.sequence = s->sequence++; cb->vb.sequence = s->sequence++;
vb2_buffer_done(&cb->vb, (skip || s->unstable_frame) ? vb2_buffer_done(&cb->vb.vb2_buf,
(skip || s->unstable_frame) ?
VB2_BUF_STATE_REQUEUEING : VB2_BUF_STATE_DONE); VB2_BUF_STATE_REQUEUEING : VB2_BUF_STATE_DONE);
} }

20
drivers/media/pci/cobalt/cobalt-v4l2.c
View File

@ -75,7 +75,7 @@ static int cobalt_buf_init(struct vb2_buffer *vb)
const size_t bytes = const size_t bytes =
COBALT_MAX_HEIGHT * max_pages_per_line * 0x20; COBALT_MAX_HEIGHT * max_pages_per_line * 0x20;
const size_t audio_bytes = ((1920 * 4) / PAGE_SIZE + 1) * 0x20; const size_t audio_bytes = ((1920 * 4) / PAGE_SIZE + 1) * 0x20;
struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->v4l2_buf.index]; struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->index];
struct sg_table *sg_desc = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sg_desc = vb2_dma_sg_plane_desc(vb, 0);
unsigned size; unsigned size;
int ret; int ret;
@ -105,17 +105,18 @@ static int cobalt_buf_init(struct vb2_buffer *vb)
static void cobalt_buf_cleanup(struct vb2_buffer *vb) static void cobalt_buf_cleanup(struct vb2_buffer *vb)
{ {
struct cobalt_stream *s = vb->vb2_queue->drv_priv; struct cobalt_stream *s = vb->vb2_queue->drv_priv;
struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->v4l2_buf.index]; struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->index];
descriptor_list_free(desc); descriptor_list_free(desc);
} }
static int cobalt_buf_prepare(struct vb2_buffer *vb) static int cobalt_buf_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cobalt_stream *s = vb->vb2_queue->drv_priv; struct cobalt_stream *s = vb->vb2_queue->drv_priv;
vb2_set_plane_payload(vb, 0, s->stride * s->height); vb2_set_plane_payload(vb, 0, s->stride * s->height);
vb->v4l2_buf.field = V4L2_FIELD_NONE; vbuf->field = V4L2_FIELD_NONE;
return 0; return 0;
} }
@ -128,7 +129,7 @@ static void chain_all_buffers(struct cobalt_stream *s)
list_for_each(p, &s->bufs) { list_for_each(p, &s->bufs) {
cb = list_entry(p, struct cobalt_buffer, list); cb = list_entry(p, struct cobalt_buffer, list);
desc[i] = &s->dma_desc_info[cb->vb.v4l2_buf.index]; desc[i] = &s->dma_desc_info[cb->vb.vb2_buf.index];
if (i > 0) if (i > 0)
descriptor_list_chain(desc[i-1], desc[i]); descriptor_list_chain(desc[i-1], desc[i]);
i++; i++;
@ -137,10 +138,11 @@ static void chain_all_buffers(struct cobalt_stream *s)
static void cobalt_buf_queue(struct vb2_buffer *vb) static void cobalt_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vb2_queue *q = vb->vb2_queue; struct vb2_queue *q = vb->vb2_queue;
struct cobalt_stream *s = q->drv_priv; struct cobalt_stream *s = q->drv_priv;
struct cobalt_buffer *cb = to_cobalt_buffer(vb); struct cobalt_buffer *cb = to_cobalt_buffer(vbuf);
struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->v4l2_buf.index]; struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->index];
unsigned long flags; unsigned long flags;
/* Prepare new buffer */ /* Prepare new buffer */
@ -284,7 +286,7 @@ static void cobalt_dma_start_streaming(struct cobalt_stream *s)
&vo->control); &vo->control);
} }
cb = list_first_entry(&s->bufs, struct cobalt_buffer, list); cb = list_first_entry(&s->bufs, struct cobalt_buffer, list);
omni_sg_dma_start(s, &s->dma_desc_info[cb->vb.v4l2_buf.index]); omni_sg_dma_start(s, &s->dma_desc_info[cb->vb.vb2_buf.index]);
spin_unlock_irqrestore(&s->irqlock, flags); spin_unlock_irqrestore(&s->irqlock, flags);
} }
@ -381,7 +383,7 @@ static void cobalt_dma_stop_streaming(struct cobalt_stream *s)
spin_lock_irqsave(&s->irqlock, flags); spin_lock_irqsave(&s->irqlock, flags);
list_for_each(p, &s->bufs) { list_for_each(p, &s->bufs) {
cb = list_entry(p, struct cobalt_buffer, list); cb = list_entry(p, struct cobalt_buffer, list);
desc = &s->dma_desc_info[cb->vb.v4l2_buf.index]; desc = &s->dma_desc_info[cb->vb.vb2_buf.index];
/* Stop DMA after this descriptor chain */ /* Stop DMA after this descriptor chain */
descriptor_list_end_of_chain(desc); descriptor_list_end_of_chain(desc);
} }
@ -416,7 +418,7 @@ static void cobalt_stop_streaming(struct vb2_queue *q)
list_for_each_safe(p, safe, &s->bufs) { list_for_each_safe(p, safe, &s->bufs) {
cb = list_entry(p, struct cobalt_buffer, list); cb = list_entry(p, struct cobalt_buffer, list);
list_del(&cb->list); list_del(&cb->list);
vb2_buffer_done(&cb->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&cb->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&s->irqlock, flags); spin_unlock_irqrestore(&s->irqlock, flags);

11
drivers/media/pci/cx23885/cx23885-417.c
View File

@ -1155,17 +1155,19 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
static int buffer_prepare(struct vb2_buffer *vb) static int buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_dev *dev = vb->vb2_queue->drv_priv; struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
struct cx23885_buffer *buf = struct cx23885_buffer *buf =
container_of(vb, struct cx23885_buffer, vb); container_of(vbuf, struct cx23885_buffer, vb);
return cx23885_buf_prepare(buf, &dev->ts1); return cx23885_buf_prepare(buf, &dev->ts1);
} }
static void buffer_finish(struct vb2_buffer *vb) static void buffer_finish(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_dev *dev = vb->vb2_queue->drv_priv; struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
struct cx23885_buffer *buf = container_of(vb, struct cx23885_buffer *buf = container_of(vbuf,
struct cx23885_buffer, vb); struct cx23885_buffer, vb);
cx23885_free_buffer(dev, buf); cx23885_free_buffer(dev, buf);
@ -1173,8 +1175,9 @@ static void buffer_finish(struct vb2_buffer *vb)
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_dev *dev = vb->vb2_queue->drv_priv; struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
struct cx23885_buffer *buf = container_of(vb, struct cx23885_buffer *buf = container_of(vbuf,
struct cx23885_buffer, vb); struct cx23885_buffer, vb);
cx23885_buf_queue(&dev->ts1, buf); cx23885_buf_queue(&dev->ts1, buf);
@ -1201,7 +1204,7 @@ static int cx23885_start_streaming(struct vb2_queue *q, unsigned int count)
struct cx23885_buffer, queue); struct cx23885_buffer, queue);
list_del(&buf->queue); list_del(&buf->queue);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
} }
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
return ret; return ret;

24
drivers/media/pci/cx23885/cx23885-core.c
View File

@ -427,12 +427,13 @@ static void cx23885_wakeup(struct cx23885_tsport *port,
buf = list_entry(q->active.next, buf = list_entry(q->active.next,
struct cx23885_buffer, queue); struct cx23885_buffer, queue);
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.timestamp);
buf->vb.v4l2_buf.sequence = q->count++; buf->vb.sequence = q->count++;
dprintk(1, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.v4l2_buf.index, dprintk(1, "[%p/%d] wakeup reg=%d buf=%d\n", buf,
buf->vb.vb2_buf.index,
count, q->count); count, q->count);
list_del(&buf->queue); list_del(&buf->queue);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
} }
int cx23885_sram_channel_setup(struct cx23885_dev *dev, int cx23885_sram_channel_setup(struct cx23885_dev *dev,
@ -1453,12 +1454,12 @@ int cx23885_buf_prepare(struct cx23885_buffer *buf, struct cx23885_tsport *port)
{ {
struct cx23885_dev *dev = port->dev; struct cx23885_dev *dev = port->dev;
int size = port->ts_packet_size * port->ts_packet_count; int size = port->ts_packet_size * port->ts_packet_count;
struct sg_table *sgt = vb2_dma_sg_plane_desc(&buf->vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(&buf->vb.vb2_buf, 0);
dprintk(1, "%s: %p\n", __func__, buf); dprintk(1, "%s: %p\n", __func__, buf);
if (vb2_plane_size(&buf->vb, 0) < size) if (vb2_plane_size(&buf->vb.vb2_buf, 0) < size)
return -EINVAL; return -EINVAL;
vb2_set_plane_payload(&buf->vb, 0, size); vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
cx23885_risc_databuffer(dev->pci, &buf->risc, cx23885_risc_databuffer(dev->pci, &buf->risc,
sgt->sgl, sgt->sgl,
@ -1503,7 +1504,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
if (list_empty(&cx88q->active)) { if (list_empty(&cx88q->active)) {
list_add_tail(&buf->queue, &cx88q->active); list_add_tail(&buf->queue, &cx88q->active);
dprintk(1, "[%p/%d] %s - first active\n", dprintk(1, "[%p/%d] %s - first active\n",
buf, buf->vb.v4l2_buf.index, __func__); buf, buf->vb.vb2_buf.index, __func__);
} else { } else {
buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1); buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
prev = list_entry(cx88q->active.prev, struct cx23885_buffer, prev = list_entry(cx88q->active.prev, struct cx23885_buffer,
@ -1511,7 +1512,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
list_add_tail(&buf->queue, &cx88q->active); list_add_tail(&buf->queue, &cx88q->active);
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
dprintk(1, "[%p/%d] %s - append to active\n", dprintk(1, "[%p/%d] %s - append to active\n",
buf, buf->vb.v4l2_buf.index, __func__); buf, buf->vb.vb2_buf.index, __func__);
} }
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
} }
@ -1530,9 +1531,10 @@ static void do_cancel_buffers(struct cx23885_tsport *port, char *reason)
buf = list_entry(q->active.next, struct cx23885_buffer, buf = list_entry(q->active.next, struct cx23885_buffer,
queue); queue);
list_del(&buf->queue); list_del(&buf->queue);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
dprintk(1, "[%p/%d] %s - dma=0x%08lx\n", dprintk(1, "[%p/%d] %s - dma=0x%08lx\n",
buf, buf->vb.v4l2_buf.index, reason, (unsigned long)buf->risc.dma); buf, buf->vb.vb2_buf.index, reason,
(unsigned long)buf->risc.dma);
} }
spin_unlock_irqrestore(&port->slock, flags); spin_unlock_irqrestore(&port->slock, flags);
} }

9
drivers/media/pci/cx23885/cx23885-dvb.c
View File

@ -110,18 +110,20 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
static int buffer_prepare(struct vb2_buffer *vb) static int buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_tsport *port = vb->vb2_queue->drv_priv; struct cx23885_tsport *port = vb->vb2_queue->drv_priv;
struct cx23885_buffer *buf = struct cx23885_buffer *buf =
container_of(vb, struct cx23885_buffer, vb); container_of(vbuf, struct cx23885_buffer, vb);
return cx23885_buf_prepare(buf, port); return cx23885_buf_prepare(buf, port);
} }
static void buffer_finish(struct vb2_buffer *vb) static void buffer_finish(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_tsport *port = vb->vb2_queue->drv_priv; struct cx23885_tsport *port = vb->vb2_queue->drv_priv;
struct cx23885_dev *dev = port->dev; struct cx23885_dev *dev = port->dev;
struct cx23885_buffer *buf = container_of(vb, struct cx23885_buffer *buf = container_of(vbuf,
struct cx23885_buffer, vb); struct cx23885_buffer, vb);
cx23885_free_buffer(dev, buf); cx23885_free_buffer(dev, buf);
@ -129,8 +131,9 @@ static void buffer_finish(struct vb2_buffer *vb)
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_tsport *port = vb->vb2_queue->drv_priv; struct cx23885_tsport *port = vb->vb2_queue->drv_priv;
struct cx23885_buffer *buf = container_of(vb, struct cx23885_buffer *buf = container_of(vbuf,
struct cx23885_buffer, vb); struct cx23885_buffer, vb);
cx23885_buf_queue(port, buf); cx23885_buf_queue(port, buf);

16
drivers/media/pci/cx23885/cx23885-vbi.c
View File

@ -138,8 +138,9 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
static int buffer_prepare(struct vb2_buffer *vb) static int buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_dev *dev = vb->vb2_queue->drv_priv; struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
struct cx23885_buffer *buf = container_of(vb, struct cx23885_buffer *buf = container_of(vbuf,
struct cx23885_buffer, vb); struct cx23885_buffer, vb);
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
unsigned lines = VBI_PAL_LINE_COUNT; unsigned lines = VBI_PAL_LINE_COUNT;
@ -161,7 +162,8 @@ static int buffer_prepare(struct vb2_buffer *vb)
static void buffer_finish(struct vb2_buffer *vb) static void buffer_finish(struct vb2_buffer *vb)
{ {
struct cx23885_buffer *buf = container_of(vb, struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_buffer *buf = container_of(vbuf,
struct cx23885_buffer, vb); struct cx23885_buffer, vb);
cx23885_free_buffer(vb->vb2_queue->drv_priv, buf); cx23885_free_buffer(vb->vb2_queue->drv_priv, buf);
@ -190,8 +192,10 @@ static void buffer_finish(struct vb2_buffer *vb)
*/ */
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_dev *dev = vb->vb2_queue->drv_priv; struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
struct cx23885_buffer *buf = container_of(vb, struct cx23885_buffer, vb); struct cx23885_buffer *buf = container_of(vbuf,
struct cx23885_buffer, vb);
struct cx23885_buffer *prev; struct cx23885_buffer *prev;
struct cx23885_dmaqueue *q = &dev->vbiq; struct cx23885_dmaqueue *q = &dev->vbiq;
unsigned long flags; unsigned long flags;
@ -206,7 +210,7 @@ static void buffer_queue(struct vb2_buffer *vb)
list_add_tail(&buf->queue, &q->active); list_add_tail(&buf->queue, &q->active);
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
dprintk(2, "[%p/%d] vbi_queue - first active\n", dprintk(2, "[%p/%d] vbi_queue - first active\n",
buf, buf->vb.v4l2_buf.index); buf, buf->vb.vb2_buf.index);
} else { } else {
buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1); buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
@ -217,7 +221,7 @@ static void buffer_queue(struct vb2_buffer *vb)
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
dprintk(2, "[%p/%d] buffer_queue - append to active\n", dprintk(2, "[%p/%d] buffer_queue - append to active\n",
buf, buf->vb.v4l2_buf.index); buf, buf->vb.vb2_buf.index);
} }
} }
@ -245,7 +249,7 @@ static void cx23885_stop_streaming(struct vb2_queue *q)
struct cx23885_buffer, queue); struct cx23885_buffer, queue);
list_del(&buf->queue); list_del(&buf->queue);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
} }

27
drivers/media/pci/cx23885/cx23885-video.c
View File

@ -104,12 +104,12 @@ void cx23885_video_wakeup(struct cx23885_dev *dev,
buf = list_entry(q->active.next, buf = list_entry(q->active.next,
struct cx23885_buffer, queue); struct cx23885_buffer, queue);
buf->vb.v4l2_buf.sequence = q->count++; buf->vb.sequence = q->count++;
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.timestamp);
dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.v4l2_buf.index, dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf,
count, q->count); buf->vb.vb2_buf.index, count, q->count);
list_del(&buf->queue); list_del(&buf->queue);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
} }
int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm) int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
@ -329,9 +329,10 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
static int buffer_prepare(struct vb2_buffer *vb) static int buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_dev *dev = vb->vb2_queue->drv_priv; struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
struct cx23885_buffer *buf = struct cx23885_buffer *buf =
container_of(vb, struct cx23885_buffer, vb); container_of(vbuf, struct cx23885_buffer, vb);
u32 line0_offset, line1_offset; u32 line0_offset, line1_offset;
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
int field_tff; int field_tff;
@ -401,7 +402,7 @@ static int buffer_prepare(struct vb2_buffer *vb)
BUG(); BUG();
} }
dprintk(2, "[%p/%d] buffer_init - %dx%d %dbpp \"%s\" - dma=0x%08lx\n", dprintk(2, "[%p/%d] buffer_init - %dx%d %dbpp \"%s\" - dma=0x%08lx\n",
buf, buf->vb.v4l2_buf.index, buf, buf->vb.vb2_buf.index,
dev->width, dev->height, dev->fmt->depth, dev->fmt->name, dev->width, dev->height, dev->fmt->depth, dev->fmt->name,
(unsigned long)buf->risc.dma); (unsigned long)buf->risc.dma);
return 0; return 0;
@ -409,7 +410,8 @@ static int buffer_prepare(struct vb2_buffer *vb)
static void buffer_finish(struct vb2_buffer *vb) static void buffer_finish(struct vb2_buffer *vb)
{ {
struct cx23885_buffer *buf = container_of(vb, struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_buffer *buf = container_of(vbuf,
struct cx23885_buffer, vb); struct cx23885_buffer, vb);
cx23885_free_buffer(vb->vb2_queue->drv_priv, buf); cx23885_free_buffer(vb->vb2_queue->drv_priv, buf);
@ -438,8 +440,9 @@ static void buffer_finish(struct vb2_buffer *vb)
*/ */
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx23885_dev *dev = vb->vb2_queue->drv_priv; struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
struct cx23885_buffer *buf = container_of(vb, struct cx23885_buffer *buf = container_of(vbuf,
struct cx23885_buffer, vb); struct cx23885_buffer, vb);
struct cx23885_buffer *prev; struct cx23885_buffer *prev;
struct cx23885_dmaqueue *q = &dev->vidq; struct cx23885_dmaqueue *q = &dev->vidq;
@ -455,7 +458,7 @@ static void buffer_queue(struct vb2_buffer *vb)
if (list_empty(&q->active)) { if (list_empty(&q->active)) {
list_add_tail(&buf->queue, &q->active); list_add_tail(&buf->queue, &q->active);
dprintk(2, "[%p/%d] buffer_queue - first active\n", dprintk(2, "[%p/%d] buffer_queue - first active\n",
buf, buf->vb.v4l2_buf.index); buf, buf->vb.vb2_buf.index);
} else { } else {
buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1); buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
prev = list_entry(q->active.prev, struct cx23885_buffer, prev = list_entry(q->active.prev, struct cx23885_buffer,
@ -463,7 +466,7 @@ static void buffer_queue(struct vb2_buffer *vb)
list_add_tail(&buf->queue, &q->active); list_add_tail(&buf->queue, &q->active);
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
dprintk(2, "[%p/%d] buffer_queue - append to active\n", dprintk(2, "[%p/%d] buffer_queue - append to active\n",
buf, buf->vb.v4l2_buf.index); buf, buf->vb.vb2_buf.index);
} }
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
} }
@ -492,7 +495,7 @@ static void cx23885_stop_streaming(struct vb2_queue *q)
struct cx23885_buffer, queue); struct cx23885_buffer, queue);
list_del(&buf->queue); list_del(&buf->queue);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
} }

2
drivers/media/pci/cx23885/cx23885.h
View File

@ -170,7 +170,7 @@ struct cx23885_riscmem {
/* buffer for one video frame */ /* buffer for one video frame */
struct cx23885_buffer { struct cx23885_buffer {
/* common v4l buffer stuff -- must be first */ /* common v4l buffer stuff -- must be first */
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head queue; struct list_head queue;
/* cx23885 specific */ /* cx23885 specific */

21
drivers/media/pci/cx25821/cx25821-video.c
View File

@ -130,10 +130,10 @@ int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status)
buf = list_entry(dmaq->active.next, buf = list_entry(dmaq->active.next,
struct cx25821_buffer, queue); struct cx25821_buffer, queue);
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.timestamp);
buf->vb.v4l2_buf.sequence = dmaq->count++; buf->vb.sequence = dmaq->count++;
list_del(&buf->queue); list_del(&buf->queue);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
} }
spin_unlock(&dev->slock); spin_unlock(&dev->slock);
handled++; handled++;
@ -159,10 +159,11 @@ static int cx25821_queue_setup(struct vb2_queue *q, const struct v4l2_format *fm
static int cx25821_buffer_prepare(struct vb2_buffer *vb) static int cx25821_buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx25821_channel *chan = vb->vb2_queue->drv_priv; struct cx25821_channel *chan = vb->vb2_queue->drv_priv;
struct cx25821_dev *dev = chan->dev; struct cx25821_dev *dev = chan->dev;
struct cx25821_buffer *buf = struct cx25821_buffer *buf =
container_of(vb, struct cx25821_buffer, vb); container_of(vbuf, struct cx25821_buffer, vb);
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
u32 line0_offset; u32 line0_offset;
int bpl_local = LINE_SIZE_D1; int bpl_local = LINE_SIZE_D1;
@ -176,7 +177,7 @@ static int cx25821_buffer_prepare(struct vb2_buffer *vb)
if (vb2_plane_size(vb, 0) < chan->height * buf->bpl) if (vb2_plane_size(vb, 0) < chan->height * buf->bpl)
return -EINVAL; return -EINVAL;
vb2_set_plane_payload(vb, 0, chan->height * buf->bpl); vb2_set_plane_payload(vb, 0, chan->height * buf->bpl);
buf->vb.v4l2_buf.field = chan->field; buf->vb.field = chan->field;
if (chan->pixel_formats == PIXEL_FRMT_411) { if (chan->pixel_formats == PIXEL_FRMT_411) {
bpl_local = buf->bpl; bpl_local = buf->bpl;
@ -231,7 +232,7 @@ static int cx25821_buffer_prepare(struct vb2_buffer *vb)
} }
dprintk(2, "[%p/%d] buffer_prep - %dx%d %dbpp \"%s\" - dma=0x%08lx\n", dprintk(2, "[%p/%d] buffer_prep - %dx%d %dbpp \"%s\" - dma=0x%08lx\n",
buf, buf->vb.v4l2_buf.index, chan->width, chan->height, buf, buf->vb.vb2_buf.index, chan->width, chan->height,
chan->fmt->depth, chan->fmt->name, chan->fmt->depth, chan->fmt->name,
(unsigned long)buf->risc.dma); (unsigned long)buf->risc.dma);
@ -240,8 +241,9 @@ static int cx25821_buffer_prepare(struct vb2_buffer *vb)
static void cx25821_buffer_finish(struct vb2_buffer *vb) static void cx25821_buffer_finish(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx25821_buffer *buf = struct cx25821_buffer *buf =
container_of(vb, struct cx25821_buffer, vb); container_of(vbuf, struct cx25821_buffer, vb);
struct cx25821_channel *chan = vb->vb2_queue->drv_priv; struct cx25821_channel *chan = vb->vb2_queue->drv_priv;
struct cx25821_dev *dev = chan->dev; struct cx25821_dev *dev = chan->dev;
@ -250,8 +252,9 @@ static void cx25821_buffer_finish(struct vb2_buffer *vb)
static void cx25821_buffer_queue(struct vb2_buffer *vb) static void cx25821_buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx25821_buffer *buf = struct cx25821_buffer *buf =
container_of(vb, struct cx25821_buffer, vb); container_of(vbuf, struct cx25821_buffer, vb);
struct cx25821_channel *chan = vb->vb2_queue->drv_priv; struct cx25821_channel *chan = vb->vb2_queue->drv_priv;
struct cx25821_dev *dev = chan->dev; struct cx25821_dev *dev = chan->dev;
struct cx25821_buffer *prev; struct cx25821_buffer *prev;
@ -300,7 +303,7 @@ static void cx25821_stop_streaming(struct vb2_queue *q)
struct cx25821_buffer, queue); struct cx25821_buffer, queue);
list_del(&buf->queue); list_del(&buf->queue);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
} }

3
drivers/media/pci/cx25821/cx25821.h
View File

@ -34,6 +34,7 @@
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h> #include <media/v4l2-ctrls.h>
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-dma-sg.h> #include <media/videobuf2-dma-sg.h>
#include "cx25821-reg.h" #include "cx25821-reg.h"
@ -127,7 +128,7 @@ struct cx25821_riscmem {
/* buffer for one video frame */ /* buffer for one video frame */
struct cx25821_buffer { struct cx25821_buffer {
/* common v4l buffer stuff -- must be first */ /* common v4l buffer stuff -- must be first */
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head queue; struct list_head queue;
/* cx25821 specific */ /* cx25821 specific */

13
drivers/media/pci/cx88/cx88-blackbird.c
View File

@ -653,16 +653,18 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
static int buffer_prepare(struct vb2_buffer *vb) static int buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8802_dev *dev = vb->vb2_queue->drv_priv; struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
return cx8802_buf_prepare(vb->vb2_queue, dev, buf); return cx8802_buf_prepare(vb->vb2_queue, dev, buf);
} }
static void buffer_finish(struct vb2_buffer *vb) static void buffer_finish(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8802_dev *dev = vb->vb2_queue->drv_priv; struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
struct cx88_riscmem *risc = &buf->risc; struct cx88_riscmem *risc = &buf->risc;
if (risc->cpu) if (risc->cpu)
@ -672,8 +674,9 @@ static void buffer_finish(struct vb2_buffer *vb)
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8802_dev *dev = vb->vb2_queue->drv_priv; struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
cx8802_buf_queue(dev, buf); cx8802_buf_queue(dev, buf);
} }
@ -721,7 +724,7 @@ fail:
struct cx88_buffer, list); struct cx88_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
} }
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
return err; return err;
@ -749,7 +752,7 @@ static void stop_streaming(struct vb2_queue *q)
struct cx88_buffer, list); struct cx88_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
} }

8
drivers/media/pci/cx88/cx88-core.c
View File

@ -518,11 +518,11 @@ void cx88_wakeup(struct cx88_core *core,
buf = list_entry(q->active.next, buf = list_entry(q->active.next,
struct cx88_buffer, list); struct cx88_buffer, list);
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.timestamp);
buf->vb.v4l2_buf.field = core->field; buf->vb.field = core->field;
buf->vb.v4l2_buf.sequence = q->count++; buf->vb.sequence = q->count++;
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
} }
void cx88_shutdown(struct cx88_core *core) void cx88_shutdown(struct cx88_core *core)

11
drivers/media/pci/cx88/cx88-dvb.c
View File

@ -99,16 +99,18 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
static int buffer_prepare(struct vb2_buffer *vb) static int buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8802_dev *dev = vb->vb2_queue->drv_priv; struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
return cx8802_buf_prepare(vb->vb2_queue, dev, buf); return cx8802_buf_prepare(vb->vb2_queue, dev, buf);
} }
static void buffer_finish(struct vb2_buffer *vb) static void buffer_finish(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8802_dev *dev = vb->vb2_queue->drv_priv; struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
struct cx88_riscmem *risc = &buf->risc; struct cx88_riscmem *risc = &buf->risc;
if (risc->cpu) if (risc->cpu)
@ -118,8 +120,9 @@ static void buffer_finish(struct vb2_buffer *vb)
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8802_dev *dev = vb->vb2_queue->drv_priv; struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
cx8802_buf_queue(dev, buf); cx8802_buf_queue(dev, buf);
} }
@ -149,7 +152,7 @@ static void stop_streaming(struct vb2_queue *q)
struct cx88_buffer, list); struct cx88_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
} }

14
drivers/media/pci/cx88/cx88-mpeg.c
View File

@ -214,7 +214,7 @@ static int cx8802_restart_queue(struct cx8802_dev *dev,
buf = list_entry(q->active.next, struct cx88_buffer, list); buf = list_entry(q->active.next, struct cx88_buffer, list);
dprintk(2,"restart_queue [%p/%d]: restart dma\n", dprintk(2,"restart_queue [%p/%d]: restart dma\n",
buf, buf->vb.v4l2_buf.index); buf, buf->vb.vb2_buf.index);
cx8802_start_dma(dev, q, buf); cx8802_start_dma(dev, q, buf);
return 0; return 0;
} }
@ -225,13 +225,13 @@ int cx8802_buf_prepare(struct vb2_queue *q, struct cx8802_dev *dev,
struct cx88_buffer *buf) struct cx88_buffer *buf)
{ {
int size = dev->ts_packet_size * dev->ts_packet_count; int size = dev->ts_packet_size * dev->ts_packet_count;
struct sg_table *sgt = vb2_dma_sg_plane_desc(&buf->vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(&buf->vb.vb2_buf, 0);
struct cx88_riscmem *risc = &buf->risc; struct cx88_riscmem *risc = &buf->risc;
int rc; int rc;
if (vb2_plane_size(&buf->vb, 0) < size) if (vb2_plane_size(&buf->vb.vb2_buf, 0) < size)
return -EINVAL; return -EINVAL;
vb2_set_plane_payload(&buf->vb, 0, size); vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
rc = cx88_risc_databuffer(dev->pci, risc, sgt->sgl, rc = cx88_risc_databuffer(dev->pci, risc, sgt->sgl,
dev->ts_packet_size, dev->ts_packet_count, 0); dev->ts_packet_size, dev->ts_packet_count, 0);
@ -259,7 +259,7 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
dprintk( 1, "queue is empty - first active\n" ); dprintk( 1, "queue is empty - first active\n" );
list_add_tail(&buf->list, &cx88q->active); list_add_tail(&buf->list, &cx88q->active);
dprintk(1,"[%p/%d] %s - first active\n", dprintk(1,"[%p/%d] %s - first active\n",
buf, buf->vb.v4l2_buf.index, __func__); buf, buf->vb.vb2_buf.index, __func__);
} else { } else {
buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1); buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
@ -268,7 +268,7 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
list_add_tail(&buf->list, &cx88q->active); list_add_tail(&buf->list, &cx88q->active);
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
dprintk( 1, "[%p/%d] %s - append to active\n", dprintk( 1, "[%p/%d] %s - append to active\n",
buf, buf->vb.v4l2_buf.index, __func__); buf, buf->vb.vb2_buf.index, __func__);
} }
} }
@ -284,7 +284,7 @@ static void do_cancel_buffers(struct cx8802_dev *dev)
while (!list_empty(&q->active)) { while (!list_empty(&q->active)) {
buf = list_entry(q->active.next, struct cx88_buffer, list); buf = list_entry(q->active.next, struct cx88_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&dev->slock,flags); spin_unlock_irqrestore(&dev->slock,flags);
} }

17
drivers/media/pci/cx88/cx88-vbi.c
View File

@ -100,7 +100,7 @@ int cx8800_restart_vbi_queue(struct cx8800_dev *dev,
buf = list_entry(q->active.next, struct cx88_buffer, list); buf = list_entry(q->active.next, struct cx88_buffer, list);
dprintk(2,"restart_queue [%p/%d]: restart dma\n", dprintk(2,"restart_queue [%p/%d]: restart dma\n",
buf, buf->vb.v4l2_buf.index); buf, buf->vb.vb2_buf.index);
cx8800_start_vbi_dma(dev, q, buf); cx8800_start_vbi_dma(dev, q, buf);
return 0; return 0;
} }
@ -125,8 +125,9 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
static int buffer_prepare(struct vb2_buffer *vb) static int buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8800_dev *dev = vb->vb2_queue->drv_priv; struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
unsigned int lines; unsigned int lines;
unsigned int size; unsigned int size;
@ -149,8 +150,9 @@ static int buffer_prepare(struct vb2_buffer *vb)
static void buffer_finish(struct vb2_buffer *vb) static void buffer_finish(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8800_dev *dev = vb->vb2_queue->drv_priv; struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
struct cx88_riscmem *risc = &buf->risc; struct cx88_riscmem *risc = &buf->risc;
if (risc->cpu) if (risc->cpu)
@ -160,8 +162,9 @@ static void buffer_finish(struct vb2_buffer *vb)
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8800_dev *dev = vb->vb2_queue->drv_priv; struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
struct cx88_buffer *prev; struct cx88_buffer *prev;
struct cx88_dmaqueue *q = &dev->vbiq; struct cx88_dmaqueue *q = &dev->vbiq;
@ -174,7 +177,7 @@ static void buffer_queue(struct vb2_buffer *vb)
list_add_tail(&buf->list, &q->active); list_add_tail(&buf->list, &q->active);
cx8800_start_vbi_dma(dev, q, buf); cx8800_start_vbi_dma(dev, q, buf);
dprintk(2,"[%p/%d] vbi_queue - first active\n", dprintk(2,"[%p/%d] vbi_queue - first active\n",
buf, buf->vb.v4l2_buf.index); buf, buf->vb.vb2_buf.index);
} else { } else {
buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1); buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
@ -182,7 +185,7 @@ static void buffer_queue(struct vb2_buffer *vb)
list_add_tail(&buf->list, &q->active); list_add_tail(&buf->list, &q->active);
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
dprintk(2,"[%p/%d] buffer_queue - append to active\n", dprintk(2,"[%p/%d] buffer_queue - append to active\n",
buf, buf->vb.v4l2_buf.index); buf, buf->vb.vb2_buf.index);
} }
} }
@ -213,7 +216,7 @@ static void stop_streaming(struct vb2_queue *q)
struct cx88_buffer, list); struct cx88_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
} }

19
drivers/media/pci/cx88/cx88-video.c
View File

@ -420,7 +420,7 @@ static int restart_video_queue(struct cx8800_dev *dev,
if (!list_empty(&q->active)) { if (!list_empty(&q->active)) {
buf = list_entry(q->active.next, struct cx88_buffer, list); buf = list_entry(q->active.next, struct cx88_buffer, list);
dprintk(2,"restart_queue [%p/%d]: restart dma\n", dprintk(2,"restart_queue [%p/%d]: restart dma\n",
buf, buf->vb.v4l2_buf.index); buf, buf->vb.vb2_buf.index);
start_video_dma(dev, q, buf); start_video_dma(dev, q, buf);
} }
return 0; return 0;
@ -444,9 +444,10 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
static int buffer_prepare(struct vb2_buffer *vb) static int buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8800_dev *dev = vb->vb2_queue->drv_priv; struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_core *core = dev->core; struct cx88_core *core = dev->core;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
buf->bpl = core->width * dev->fmt->depth >> 3; buf->bpl = core->width * dev->fmt->depth >> 3;
@ -489,7 +490,7 @@ static int buffer_prepare(struct vb2_buffer *vb)
break; break;
} }
dprintk(2,"[%p/%d] buffer_prepare - %dx%d %dbpp \"%s\" - dma=0x%08lx\n", dprintk(2,"[%p/%d] buffer_prepare - %dx%d %dbpp \"%s\" - dma=0x%08lx\n",
buf, buf->vb.v4l2_buf.index, buf, buf->vb.vb2_buf.index,
core->width, core->height, dev->fmt->depth, dev->fmt->name, core->width, core->height, dev->fmt->depth, dev->fmt->name,
(unsigned long)buf->risc.dma); (unsigned long)buf->risc.dma);
return 0; return 0;
@ -497,8 +498,9 @@ static int buffer_prepare(struct vb2_buffer *vb)
static void buffer_finish(struct vb2_buffer *vb) static void buffer_finish(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8800_dev *dev = vb->vb2_queue->drv_priv; struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
struct cx88_riscmem *risc = &buf->risc; struct cx88_riscmem *risc = &buf->risc;
if (risc->cpu) if (risc->cpu)
@ -508,8 +510,9 @@ static void buffer_finish(struct vb2_buffer *vb)
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct cx8800_dev *dev = vb->vb2_queue->drv_priv; struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
struct cx88_buffer *prev; struct cx88_buffer *prev;
struct cx88_core *core = dev->core; struct cx88_core *core = dev->core;
struct cx88_dmaqueue *q = &dev->vidq; struct cx88_dmaqueue *q = &dev->vidq;
@ -522,7 +525,7 @@ static void buffer_queue(struct vb2_buffer *vb)
if (list_empty(&q->active)) { if (list_empty(&q->active)) {
list_add_tail(&buf->list, &q->active); list_add_tail(&buf->list, &q->active);
dprintk(2,"[%p/%d] buffer_queue - first active\n", dprintk(2,"[%p/%d] buffer_queue - first active\n",
buf, buf->vb.v4l2_buf.index); buf, buf->vb.vb2_buf.index);
} else { } else {
buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1); buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
@ -530,7 +533,7 @@ static void buffer_queue(struct vb2_buffer *vb)
list_add_tail(&buf->list, &q->active); list_add_tail(&buf->list, &q->active);
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
dprintk(2, "[%p/%d] buffer_queue - append to active\n", dprintk(2, "[%p/%d] buffer_queue - append to active\n",
buf, buf->vb.v4l2_buf.index); buf, buf->vb.vb2_buf.index);
} }
} }
@ -560,7 +563,7 @@ static void stop_streaming(struct vb2_queue *q)
struct cx88_buffer, list); struct cx88_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&dev->slock, flags); spin_unlock_irqrestore(&dev->slock, flags);
} }

2
drivers/media/pci/cx88/cx88.h
View File

@ -321,7 +321,7 @@ struct cx88_riscmem {
/* buffer for one video frame */ /* buffer for one video frame */
struct cx88_buffer { struct cx88_buffer {
/* common v4l buffer stuff -- must be first */ /* common v4l buffer stuff -- must be first */
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
/* cx88 specific */ /* cx88 specific */

17
drivers/media/pci/dt3155/dt3155.c
View File

@ -160,7 +160,7 @@ static int dt3155_buf_prepare(struct vb2_buffer *vb)
static int dt3155_start_streaming(struct vb2_queue *q, unsigned count) static int dt3155_start_streaming(struct vb2_queue *q, unsigned count)
{ {
struct dt3155_priv *pd = vb2_get_drv_priv(q); struct dt3155_priv *pd = vb2_get_drv_priv(q);
struct vb2_buffer *vb = pd->curr_buf; struct vb2_buffer *vb = &pd->curr_buf->vb2_buf;
dma_addr_t dma_addr; dma_addr_t dma_addr;
pd->sequence = 0; pd->sequence = 0;
@ -208,7 +208,7 @@ static void dt3155_stop_streaming(struct vb2_queue *q)
spin_lock_irq(&pd->lock); spin_lock_irq(&pd->lock);
if (pd->curr_buf) { if (pd->curr_buf) {
vb2_buffer_done(pd->curr_buf, VB2_BUF_STATE_ERROR); vb2_buffer_done(&pd->curr_buf->vb2_buf, VB2_BUF_STATE_ERROR);
pd->curr_buf = NULL; pd->curr_buf = NULL;
} }
@ -222,6 +222,7 @@ static void dt3155_stop_streaming(struct vb2_queue *q)
static void dt3155_buf_queue(struct vb2_buffer *vb) static void dt3155_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct dt3155_priv *pd = vb2_get_drv_priv(vb->vb2_queue); struct dt3155_priv *pd = vb2_get_drv_priv(vb->vb2_queue);
/* pd->vidq.streaming = 1 when dt3155_buf_queue() is invoked */ /* pd->vidq.streaming = 1 when dt3155_buf_queue() is invoked */
@ -229,7 +230,7 @@ static void dt3155_buf_queue(struct vb2_buffer *vb)
if (pd->curr_buf) if (pd->curr_buf)
list_add_tail(&vb->done_entry, &pd->dmaq); list_add_tail(&vb->done_entry, &pd->dmaq);
else else
pd->curr_buf = vb; pd->curr_buf = vbuf;
spin_unlock_irq(&pd->lock); spin_unlock_irq(&pd->lock);
} }
@ -269,14 +270,14 @@ static irqreturn_t dt3155_irq_handler_even(int irq, void *dev_id)
spin_lock(&ipd->lock); spin_lock(&ipd->lock);
if (ipd->curr_buf && !list_empty(&ipd->dmaq)) { if (ipd->curr_buf && !list_empty(&ipd->dmaq)) {
v4l2_get_timestamp(&ipd->curr_buf->v4l2_buf.timestamp); v4l2_get_timestamp(&ipd->curr_buf->timestamp);
ipd->curr_buf->v4l2_buf.sequence = ipd->sequence++; ipd->curr_buf->sequence = ipd->sequence++;
ipd->curr_buf->v4l2_buf.field = V4L2_FIELD_NONE; ipd->curr_buf->field = V4L2_FIELD_NONE;
vb2_buffer_done(ipd->curr_buf, VB2_BUF_STATE_DONE); vb2_buffer_done(&ipd->curr_buf->vb2_buf, VB2_BUF_STATE_DONE);
ivb = list_first_entry(&ipd->dmaq, typeof(*ivb), done_entry); ivb = list_first_entry(&ipd->dmaq, typeof(*ivb), done_entry);
list_del(&ivb->done_entry); list_del(&ivb->done_entry);
ipd->curr_buf = ivb; ipd->curr_buf = to_vb2_v4l2_buffer(ivb);
dma_addr = vb2_dma_contig_plane_dma_addr(ivb, 0); dma_addr = vb2_dma_contig_plane_dma_addr(ivb, 0);
iowrite32(dma_addr, ipd->regs + EVEN_DMA_START); iowrite32(dma_addr, ipd->regs + EVEN_DMA_START);
iowrite32(dma_addr + ipd->width, ipd->regs + ODD_DMA_START); iowrite32(dma_addr + ipd->width, ipd->regs + ODD_DMA_START);

3
drivers/media/pci/dt3155/dt3155.h
View File

@ -22,6 +22,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-dev.h> #include <media/v4l2-dev.h>
#include <media/videobuf2-v4l2.h>
#define DT3155_NAME "dt3155" #define DT3155_NAME "dt3155"
#define DT3155_VER_MAJ 2 #define DT3155_VER_MAJ 2
@ -181,7 +182,7 @@ struct dt3155_priv {
struct pci_dev *pdev; struct pci_dev *pdev;
struct vb2_queue vidq; struct vb2_queue vidq;
struct vb2_alloc_ctx *alloc_ctx; struct vb2_alloc_ctx *alloc_ctx;
struct vb2_buffer *curr_buf; struct vb2_v4l2_buffer *curr_buf;
struct mutex mux; struct mutex mux;
struct list_head dmaq; struct list_head dmaq;
spinlock_t lock; spinlock_t lock;

19
drivers/media/pci/netup_unidvb/netup_unidvb_core.c
View File

@ -27,6 +27,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/list.h> #include <linux/list.h>
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-vmalloc.h> #include <media/videobuf2-vmalloc.h>
#include "netup_unidvb.h" #include "netup_unidvb.h"
@ -110,7 +111,7 @@ struct netup_dma_regs {
} __packed __aligned(1); } __packed __aligned(1);
struct netup_unidvb_buffer { struct netup_unidvb_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
u32 size; u32 size;
}; };
@ -300,7 +301,8 @@ static int netup_unidvb_queue_setup(struct vb2_queue *vq,
static int netup_unidvb_buf_prepare(struct vb2_buffer *vb) static int netup_unidvb_buf_prepare(struct vb2_buffer *vb)
{ {
struct netup_dma *dma = vb2_get_drv_priv(vb->vb2_queue); struct netup_dma *dma = vb2_get_drv_priv(vb->vb2_queue);
struct netup_unidvb_buffer *buf = container_of(vb, struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct netup_unidvb_buffer *buf = container_of(vbuf,
struct netup_unidvb_buffer, vb); struct netup_unidvb_buffer, vb);
dev_dbg(&dma->ndev->pci_dev->dev, "%s(): buf 0x%p\n", __func__, buf); dev_dbg(&dma->ndev->pci_dev->dev, "%s(): buf 0x%p\n", __func__, buf);
@ -312,7 +314,8 @@ static void netup_unidvb_buf_queue(struct vb2_buffer *vb)
{ {
unsigned long flags; unsigned long flags;
struct netup_dma *dma = vb2_get_drv_priv(vb->vb2_queue); struct netup_dma *dma = vb2_get_drv_priv(vb->vb2_queue);
struct netup_unidvb_buffer *buf = container_of(vb, struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct netup_unidvb_buffer *buf = container_of(vbuf,
struct netup_unidvb_buffer, vb); struct netup_unidvb_buffer, vb);
dev_dbg(&dma->ndev->pci_dev->dev, "%s(): %p\n", __func__, buf); dev_dbg(&dma->ndev->pci_dev->dev, "%s(): %p\n", __func__, buf);
@ -509,7 +512,7 @@ static int netup_unidvb_ring_copy(struct netup_dma *dma,
{ {
u32 copy_bytes, ring_bytes; u32 copy_bytes, ring_bytes;
u32 buff_bytes = NETUP_DMA_PACKETS_COUNT * 188 - buf->size; u32 buff_bytes = NETUP_DMA_PACKETS_COUNT * 188 - buf->size;
u8 *p = vb2_plane_vaddr(&buf->vb, 0); u8 *p = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
struct netup_unidvb_dev *ndev = dma->ndev; struct netup_unidvb_dev *ndev = dma->ndev;
if (p == NULL) { if (p == NULL) {
@ -579,9 +582,9 @@ static void netup_unidvb_dma_worker(struct work_struct *work)
dev_dbg(&ndev->pci_dev->dev, dev_dbg(&ndev->pci_dev->dev,
"%s(): buffer %p done, size %d\n", "%s(): buffer %p done, size %d\n",
__func__, buf, buf->size); __func__, buf, buf->size);
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.timestamp);
vb2_set_plane_payload(&buf->vb, 0, buf->size); vb2_set_plane_payload(&buf->vb.vb2_buf, 0, buf->size);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
} }
} }
work_done: work_done:
@ -599,7 +602,7 @@ static void netup_unidvb_queue_cleanup(struct netup_dma *dma)
buf = list_first_entry(&dma->free_buffers, buf = list_first_entry(&dma->free_buffers,
struct netup_unidvb_buffer, list); struct netup_unidvb_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&dma->lock, flags); spin_unlock_irqrestore(&dma->lock, flags);
} }

14
drivers/media/pci/saa7134/saa7134-core.c
View File

@ -216,13 +216,14 @@ int saa7134_buffer_count(unsigned int size, unsigned int count)
int saa7134_buffer_startpage(struct saa7134_buf *buf) int saa7134_buffer_startpage(struct saa7134_buf *buf)
{ {
return saa7134_buffer_pages(vb2_plane_size(&buf->vb2, 0)) * buf->vb2.v4l2_buf.index; return saa7134_buffer_pages(vb2_plane_size(&buf->vb2.vb2_buf, 0))
* buf->vb2.vb2_buf.index;
} }
unsigned long saa7134_buffer_base(struct saa7134_buf *buf) unsigned long saa7134_buffer_base(struct saa7134_buf *buf)
{ {
unsigned long base; unsigned long base;
struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0); struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2.vb2_buf, 0);
base = saa7134_buffer_startpage(buf) * 4096; base = saa7134_buffer_startpage(buf) * 4096;
base += dma->sgl[0].offset; base += dma->sgl[0].offset;
@ -308,9 +309,9 @@ void saa7134_buffer_finish(struct saa7134_dev *dev,
core_dbg("buffer_finish %p\n", q->curr); core_dbg("buffer_finish %p\n", q->curr);
/* finish current buffer */ /* finish current buffer */
v4l2_get_timestamp(&q->curr->vb2.v4l2_buf.timestamp); v4l2_get_timestamp(&q->curr->vb2.timestamp);
q->curr->vb2.v4l2_buf.sequence = q->seq_nr++; q->curr->vb2.sequence = q->seq_nr++;
vb2_buffer_done(&q->curr->vb2, state); vb2_buffer_done(&q->curr->vb2.vb2_buf, state);
q->curr = NULL; q->curr = NULL;
} }
@ -375,7 +376,8 @@ void saa7134_stop_streaming(struct saa7134_dev *dev, struct saa7134_dmaqueue *q)
if (!list_empty(&q->queue)) { if (!list_empty(&q->queue)) {
list_for_each_safe(pos, n, &q->queue) { list_for_each_safe(pos, n, &q->queue) {
tmp = list_entry(pos, struct saa7134_buf, entry); tmp = list_entry(pos, struct saa7134_buf, entry);
vb2_buffer_done(&tmp->vb2, VB2_BUF_STATE_ERROR); vb2_buffer_done(&tmp->vb2.vb2_buf,
VB2_BUF_STATE_ERROR);
list_del(pos); list_del(pos);
tmp = NULL; tmp = NULL;
} }

14
drivers/media/pci/saa7134/saa7134-ts.c
View File

@ -79,8 +79,9 @@ static int buffer_activate(struct saa7134_dev *dev,
int saa7134_ts_buffer_init(struct vb2_buffer *vb2) int saa7134_ts_buffer_init(struct vb2_buffer *vb2)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv; struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2); struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
dmaq->curr = NULL; dmaq->curr = NULL;
buf->activate = buffer_activate; buf->activate = buffer_activate;
@ -91,9 +92,10 @@ EXPORT_SYMBOL_GPL(saa7134_ts_buffer_init);
int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2) int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv; struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
struct saa7134_dev *dev = dmaq->dev; struct saa7134_dev *dev = dmaq->dev;
struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2); struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
struct sg_table *dma = vb2_dma_sg_plane_desc(vb2, 0); struct sg_table *dma = vb2_dma_sg_plane_desc(vb2, 0);
unsigned int lines, llength, size; unsigned int lines, llength, size;
@ -107,7 +109,7 @@ int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2)
return -EINVAL; return -EINVAL;
vb2_set_plane_payload(vb2, 0, size); vb2_set_plane_payload(vb2, 0, size);
vb2->v4l2_buf.field = dev->field; vbuf->field = dev->field;
return saa7134_pgtable_build(dev->pci, &dmaq->pt, dma->sgl, dma->nents, return saa7134_pgtable_build(dev->pci, &dmaq->pt, dma->sgl, dma->nents,
saa7134_buffer_startpage(buf)); saa7134_buffer_startpage(buf));
@ -148,10 +150,12 @@ int saa7134_ts_start_streaming(struct vb2_queue *vq, unsigned int count)
list_for_each_entry_safe(buf, tmp, &dmaq->queue, entry) { list_for_each_entry_safe(buf, tmp, &dmaq->queue, entry) {
list_del(&buf->entry); list_del(&buf->entry);
vb2_buffer_done(&buf->vb2, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb2.vb2_buf,
VB2_BUF_STATE_QUEUED);
} }
if (dmaq->curr) { if (dmaq->curr) {
vb2_buffer_done(&dmaq->curr->vb2, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&dmaq->curr->vb2.vb2_buf,
VB2_BUF_STATE_QUEUED);
dmaq->curr = NULL; dmaq->curr = NULL;
} }
return -EBUSY; return -EBUSY;

10
drivers/media/pci/saa7134/saa7134-vbi.c
View File

@ -83,7 +83,7 @@ static int buffer_activate(struct saa7134_dev *dev,
struct saa7134_buf *buf, struct saa7134_buf *buf,
struct saa7134_buf *next) struct saa7134_buf *next)
{ {
struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_queue->drv_priv; struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_buf.vb2_queue->drv_priv;
unsigned long control, base; unsigned long control, base;
vbi_dbg("buffer_activate [%p]\n", buf); vbi_dbg("buffer_activate [%p]\n", buf);
@ -119,8 +119,9 @@ static int buffer_prepare(struct vb2_buffer *vb2)
{ {
struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv; struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
struct saa7134_dev *dev = dmaq->dev; struct saa7134_dev *dev = dmaq->dev;
struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0); struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
struct sg_table *dma = vb2_dma_sg_plane_desc(vb2, 0);
unsigned int size; unsigned int size;
if (dma->sgl->offset) { if (dma->sgl->offset) {
@ -161,7 +162,8 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
static int buffer_init(struct vb2_buffer *vb2) static int buffer_init(struct vb2_buffer *vb2)
{ {
struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv; struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
dmaq->curr = NULL; dmaq->curr = NULL;
buf->activate = buffer_activate; buf->activate = buffer_activate;

21
drivers/media/pci/saa7134/saa7134-video.c
View File

@ -791,7 +791,7 @@ static int buffer_activate(struct saa7134_dev *dev,
struct saa7134_buf *buf, struct saa7134_buf *buf,
struct saa7134_buf *next) struct saa7134_buf *next)
{ {
struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_queue->drv_priv; struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_buf.vb2_queue->drv_priv;
unsigned long base,control,bpl; unsigned long base,control,bpl;
unsigned long bpl_uv,lines_uv,base2,base3,tmp; /* planar */ unsigned long bpl_uv,lines_uv,base2,base3,tmp; /* planar */
@ -872,7 +872,8 @@ static int buffer_activate(struct saa7134_dev *dev,
static int buffer_init(struct vb2_buffer *vb2) static int buffer_init(struct vb2_buffer *vb2)
{ {
struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv; struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
dmaq->curr = NULL; dmaq->curr = NULL;
buf->activate = buffer_activate; buf->activate = buffer_activate;
@ -883,8 +884,9 @@ static int buffer_prepare(struct vb2_buffer *vb2)
{ {
struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv; struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
struct saa7134_dev *dev = dmaq->dev; struct saa7134_dev *dev = dmaq->dev;
struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0); struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
struct sg_table *dma = vb2_dma_sg_plane_desc(vb2, 0);
unsigned int size; unsigned int size;
if (dma->sgl->offset) { if (dma->sgl->offset) {
@ -896,7 +898,7 @@ static int buffer_prepare(struct vb2_buffer *vb2)
return -EINVAL; return -EINVAL;
vb2_set_plane_payload(vb2, 0, size); vb2_set_plane_payload(vb2, 0, size);
vb2->v4l2_buf.field = dev->field; vbuf->field = dev->field;
return saa7134_pgtable_build(dev->pci, &dmaq->pt, dma->sgl, dma->nents, return saa7134_pgtable_build(dev->pci, &dmaq->pt, dma->sgl, dma->nents,
saa7134_buffer_startpage(buf)); saa7134_buffer_startpage(buf));
@ -932,7 +934,8 @@ void saa7134_vb2_buffer_queue(struct vb2_buffer *vb)
{ {
struct saa7134_dmaqueue *dmaq = vb->vb2_queue->drv_priv; struct saa7134_dmaqueue *dmaq = vb->vb2_queue->drv_priv;
struct saa7134_dev *dev = dmaq->dev; struct saa7134_dev *dev = dmaq->dev;
struct saa7134_buf *buf = container_of(vb, struct saa7134_buf, vb2); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
saa7134_buffer_queue(dev, dmaq, buf); saa7134_buffer_queue(dev, dmaq, buf);
} }
@ -953,10 +956,12 @@ int saa7134_vb2_start_streaming(struct vb2_queue *vq, unsigned int count)
list_for_each_entry_safe(buf, tmp, &dmaq->queue, entry) { list_for_each_entry_safe(buf, tmp, &dmaq->queue, entry) {
list_del(&buf->entry); list_del(&buf->entry);
vb2_buffer_done(&buf->vb2, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb2.vb2_buf,
VB2_BUF_STATE_QUEUED);
} }
if (dmaq->curr) { if (dmaq->curr) {
vb2_buffer_done(&dmaq->curr->vb2, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&dmaq->curr->vb2.vb2_buf,
VB2_BUF_STATE_QUEUED);
dmaq->curr = NULL; dmaq->curr = NULL;
} }
return -EBUSY; return -EBUSY;

2
drivers/media/pci/saa7134/saa7134.h
View File

@ -460,7 +460,7 @@ struct saa7134_thread {
/* buffer for one video/vbi/ts frame */ /* buffer for one video/vbi/ts frame */
struct saa7134_buf { struct saa7134_buf {
/* common v4l buffer stuff -- must be first */ /* common v4l buffer stuff -- must be first */
struct vb2_buffer vb2; struct vb2_v4l2_buffer vb2;
/* saa7134 specific */ /* saa7134 specific */
unsigned int top_seen; unsigned int top_seen;

46
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
View File

@ -458,11 +458,12 @@ static inline u32 vop_usec(const vop_header *vh)
static int solo_fill_jpeg(struct solo_enc_dev *solo_enc, static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
struct vb2_buffer *vb, const vop_header *vh) struct vb2_buffer *vb, const vop_header *vh)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct solo_dev *solo_dev = solo_enc->solo_dev; struct solo_dev *solo_dev = solo_enc->solo_dev;
struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
int frame_size; int frame_size;
vb->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME; vbuf->flags |= V4L2_BUF_FLAG_KEYFRAME;
if (vb2_plane_size(vb, 0) < vop_jpeg_size(vh) + solo_enc->jpeg_len) if (vb2_plane_size(vb, 0) < vop_jpeg_size(vh) + solo_enc->jpeg_len)
return -EIO; return -EIO;
@ -470,7 +471,7 @@ static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
frame_size = ALIGN(vop_jpeg_size(vh) + solo_enc->jpeg_len, DMA_ALIGN); frame_size = ALIGN(vop_jpeg_size(vh) + solo_enc->jpeg_len, DMA_ALIGN);
vb2_set_plane_payload(vb, 0, vop_jpeg_size(vh) + solo_enc->jpeg_len); vb2_set_plane_payload(vb, 0, vop_jpeg_size(vh) + solo_enc->jpeg_len);
return solo_send_desc(solo_enc, solo_enc->jpeg_len, vbuf, return solo_send_desc(solo_enc, solo_enc->jpeg_len, sgt,
vop_jpeg_offset(vh) - SOLO_JPEG_EXT_ADDR(solo_dev), vop_jpeg_offset(vh) - SOLO_JPEG_EXT_ADDR(solo_dev),
frame_size, SOLO_JPEG_EXT_ADDR(solo_dev), frame_size, SOLO_JPEG_EXT_ADDR(solo_dev),
SOLO_JPEG_EXT_SIZE(solo_dev)); SOLO_JPEG_EXT_SIZE(solo_dev));
@ -479,8 +480,9 @@ static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
static int solo_fill_mpeg(struct solo_enc_dev *solo_enc, static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
struct vb2_buffer *vb, const vop_header *vh) struct vb2_buffer *vb, const vop_header *vh)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct solo_dev *solo_dev = solo_enc->solo_dev; struct solo_dev *solo_dev = solo_enc->solo_dev;
struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
int frame_off, frame_size; int frame_off, frame_size;
int skip = 0; int skip = 0;
@ -488,15 +490,15 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
return -EIO; return -EIO;
/* If this is a key frame, add extra header */ /* If this is a key frame, add extra header */
vb->v4l2_buf.flags &= ~(V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_PFRAME | vbuf->flags &= ~(V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_PFRAME |
V4L2_BUF_FLAG_BFRAME); V4L2_BUF_FLAG_BFRAME);
if (!vop_type(vh)) { if (!vop_type(vh)) {
skip = solo_enc->vop_len; skip = solo_enc->vop_len;
vb->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME; vbuf->flags |= V4L2_BUF_FLAG_KEYFRAME;
vb2_set_plane_payload(vb, 0, vop_mpeg_size(vh) + vb2_set_plane_payload(vb, 0, vop_mpeg_size(vh) +
solo_enc->vop_len); solo_enc->vop_len);
} else { } else {
vb->v4l2_buf.flags |= V4L2_BUF_FLAG_PFRAME; vbuf->flags |= V4L2_BUF_FLAG_PFRAME;
vb2_set_plane_payload(vb, 0, vop_mpeg_size(vh)); vb2_set_plane_payload(vb, 0, vop_mpeg_size(vh));
} }
@ -505,7 +507,7 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
sizeof(*vh)) % SOLO_MP4E_EXT_SIZE(solo_dev); sizeof(*vh)) % SOLO_MP4E_EXT_SIZE(solo_dev);
frame_size = ALIGN(vop_mpeg_size(vh) + skip, DMA_ALIGN); frame_size = ALIGN(vop_mpeg_size(vh) + skip, DMA_ALIGN);
return solo_send_desc(solo_enc, skip, vbuf, frame_off, frame_size, return solo_send_desc(solo_enc, skip, sgt, frame_off, frame_size,
SOLO_MP4E_EXT_ADDR(solo_dev), SOLO_MP4E_EXT_ADDR(solo_dev),
SOLO_MP4E_EXT_SIZE(solo_dev)); SOLO_MP4E_EXT_SIZE(solo_dev));
} }
@ -513,6 +515,7 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc, static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
struct vb2_buffer *vb, struct solo_enc_buf *enc_buf) struct vb2_buffer *vb, struct solo_enc_buf *enc_buf)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
const vop_header *vh = enc_buf->vh; const vop_header *vh = enc_buf->vh;
int ret; int ret;
@ -527,17 +530,18 @@ static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
} }
if (!ret) { if (!ret) {
vb->v4l2_buf.sequence = solo_enc->sequence++; vbuf->sequence = solo_enc->sequence++;
vb->v4l2_buf.timestamp.tv_sec = vop_sec(vh); vbuf->timestamp.tv_sec = vop_sec(vh);
vb->v4l2_buf.timestamp.tv_usec = vop_usec(vh); vbuf->timestamp.tv_usec = vop_usec(vh);
/* Check for motion flags */ /* Check for motion flags */
if (solo_is_motion_on(solo_enc) && enc_buf->motion) { if (solo_is_motion_on(solo_enc) && enc_buf->motion) {
struct v4l2_event ev = { struct v4l2_event ev = {
.type = V4L2_EVENT_MOTION_DET, .type = V4L2_EVENT_MOTION_DET,
.u.motion_det = { .u.motion_det = {
.flags = V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ, .flags
.frame_sequence = vb->v4l2_buf.sequence, = V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ,
.frame_sequence = vbuf->sequence,
.region_mask = enc_buf->motion ? 1 : 0, .region_mask = enc_buf->motion ? 1 : 0,
}, },
}; };
@ -571,7 +575,7 @@ static void solo_enc_handle_one(struct solo_enc_dev *solo_enc,
list_del(&vb->list); list_del(&vb->list);
spin_unlock_irqrestore(&solo_enc->av_lock, flags); spin_unlock_irqrestore(&solo_enc->av_lock, flags);
solo_enc_fillbuf(solo_enc, &vb->vb, enc_buf); solo_enc_fillbuf(solo_enc, &vb->vb.vb2_buf, enc_buf);
unlock: unlock:
mutex_unlock(&solo_enc->lock); mutex_unlock(&solo_enc->lock);
} }
@ -678,10 +682,11 @@ static int solo_enc_queue_setup(struct vb2_queue *q,
static void solo_enc_buf_queue(struct vb2_buffer *vb) static void solo_enc_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vb2_queue *vq = vb->vb2_queue; struct vb2_queue *vq = vb->vb2_queue;
struct solo_enc_dev *solo_enc = vb2_get_drv_priv(vq); struct solo_enc_dev *solo_enc = vb2_get_drv_priv(vq);
struct solo_vb2_buf *solo_vb = struct solo_vb2_buf *solo_vb =
container_of(vb, struct solo_vb2_buf, vb); container_of(vbuf, struct solo_vb2_buf, vb);
spin_lock(&solo_enc->av_lock); spin_lock(&solo_enc->av_lock);
list_add_tail(&solo_vb->list, &solo_enc->vidq_active); list_add_tail(&solo_vb->list, &solo_enc->vidq_active);
@ -734,25 +739,26 @@ static void solo_enc_stop_streaming(struct vb2_queue *q)
struct solo_vb2_buf, list); struct solo_vb2_buf, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&solo_enc->av_lock, flags); spin_unlock_irqrestore(&solo_enc->av_lock, flags);
} }
static void solo_enc_buf_finish(struct vb2_buffer *vb) static void solo_enc_buf_finish(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct solo_enc_dev *solo_enc = vb2_get_drv_priv(vb->vb2_queue); struct solo_enc_dev *solo_enc = vb2_get_drv_priv(vb->vb2_queue);
struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
switch (solo_enc->fmt) { switch (solo_enc->fmt) {
case V4L2_PIX_FMT_MPEG4: case V4L2_PIX_FMT_MPEG4:
case V4L2_PIX_FMT_H264: case V4L2_PIX_FMT_H264:
if (vb->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) if (vbuf->flags & V4L2_BUF_FLAG_KEYFRAME)
sg_copy_from_buffer(vbuf->sgl, vbuf->nents, sg_copy_from_buffer(sgt->sgl, sgt->nents,
solo_enc->vop, solo_enc->vop_len); solo_enc->vop, solo_enc->vop_len);
break; break;
default: /* V4L2_PIX_FMT_MJPEG */ default: /* V4L2_PIX_FMT_MJPEG */
sg_copy_from_buffer(vbuf->sgl, vbuf->nents, sg_copy_from_buffer(sgt->sgl, sgt->nents,
solo_enc->jpeg_header, solo_enc->jpeg_len); solo_enc->jpeg_header, solo_enc->jpeg_len);
break; break;
} }

19
drivers/media/pci/solo6x10/solo6x10-v4l2.c
View File

@ -26,6 +26,7 @@
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
#include <media/v4l2-event.h> #include <media/v4l2-event.h>
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-dma-contig.h> #include <media/videobuf2-dma-contig.h>
#include "solo6x10.h" #include "solo6x10.h"
@ -191,13 +192,14 @@ static int solo_v4l2_set_ch(struct solo_dev *solo_dev, u8 ch)
static void solo_fillbuf(struct solo_dev *solo_dev, static void solo_fillbuf(struct solo_dev *solo_dev,
struct vb2_buffer *vb) struct vb2_buffer *vb)
{ {
dma_addr_t vbuf; struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
dma_addr_t addr;
unsigned int fdma_addr; unsigned int fdma_addr;
int error = -1; int error = -1;
int i; int i;
vbuf = vb2_dma_contig_plane_dma_addr(vb, 0); addr = vb2_dma_contig_plane_dma_addr(vb, 0);
if (!vbuf) if (!addr)
goto finish_buf; goto finish_buf;
if (erase_off(solo_dev)) { if (erase_off(solo_dev)) {
@ -213,7 +215,7 @@ static void solo_fillbuf(struct solo_dev *solo_dev,
fdma_addr = SOLO_DISP_EXT_ADDR + (solo_dev->old_write * fdma_addr = SOLO_DISP_EXT_ADDR + (solo_dev->old_write *
(SOLO_HW_BPL * solo_vlines(solo_dev))); (SOLO_HW_BPL * solo_vlines(solo_dev)));
error = solo_p2m_dma_t(solo_dev, 0, vbuf, fdma_addr, error = solo_p2m_dma_t(solo_dev, 0, addr, fdma_addr,
solo_bytesperline(solo_dev), solo_bytesperline(solo_dev),
solo_vlines(solo_dev), SOLO_HW_BPL); solo_vlines(solo_dev), SOLO_HW_BPL);
} }
@ -222,8 +224,8 @@ finish_buf:
if (!error) { if (!error) {
vb2_set_plane_payload(vb, 0, vb2_set_plane_payload(vb, 0,
solo_vlines(solo_dev) * solo_bytesperline(solo_dev)); solo_vlines(solo_dev) * solo_bytesperline(solo_dev));
vb->v4l2_buf.sequence = solo_dev->sequence++; vbuf->sequence = solo_dev->sequence++;
v4l2_get_timestamp(&vb->v4l2_buf.timestamp); v4l2_get_timestamp(&vbuf->timestamp);
} }
vb2_buffer_done(vb, error ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); vb2_buffer_done(vb, error ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
@ -256,7 +258,7 @@ static void solo_thread_try(struct solo_dev *solo_dev)
spin_unlock(&solo_dev->slock); spin_unlock(&solo_dev->slock);
solo_fillbuf(solo_dev, &vb->vb); solo_fillbuf(solo_dev, &vb->vb.vb2_buf);
} }
assert_spin_locked(&solo_dev->slock); assert_spin_locked(&solo_dev->slock);
@ -345,10 +347,11 @@ static void solo_stop_streaming(struct vb2_queue *q)
static void solo_buf_queue(struct vb2_buffer *vb) static void solo_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vb2_queue *vq = vb->vb2_queue; struct vb2_queue *vq = vb->vb2_queue;
struct solo_dev *solo_dev = vb2_get_drv_priv(vq); struct solo_dev *solo_dev = vb2_get_drv_priv(vq);
struct solo_vb2_buf *solo_vb = struct solo_vb2_buf *solo_vb =
container_of(vb, struct solo_vb2_buf, vb); container_of(vbuf, struct solo_vb2_buf, vb);
spin_lock(&solo_dev->slock); spin_lock(&solo_dev->slock);
list_add_tail(&solo_vb->list, &solo_dev->vidq_active); list_add_tail(&solo_vb->list, &solo_dev->vidq_active);

2
drivers/media/pci/solo6x10/solo6x10.h
View File

@ -135,7 +135,7 @@ struct solo_p2m_dev {
#define OSD_TEXT_MAX 44 #define OSD_TEXT_MAX 44
struct solo_vb2_buf { struct solo_vb2_buf {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };

26
drivers/media/pci/sta2x11/sta2x11_vip.c
View File

@ -88,11 +88,11 @@
struct vip_buffer { struct vip_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
dma_addr_t dma; dma_addr_t dma;
}; };
static inline struct vip_buffer *to_vip_buffer(struct vb2_buffer *vb2) static inline struct vip_buffer *to_vip_buffer(struct vb2_v4l2_buffer *vb2)
{ {
return container_of(vb2, struct vip_buffer, vb); return container_of(vb2, struct vip_buffer, vb);
} }
@ -287,7 +287,8 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
}; };
static int buffer_init(struct vb2_buffer *vb) static int buffer_init(struct vb2_buffer *vb)
{ {
struct vip_buffer *vip_buf = to_vip_buffer(vb); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vip_buffer *vip_buf = to_vip_buffer(vbuf);
vip_buf->dma = vb2_dma_contig_plane_dma_addr(vb, 0); vip_buf->dma = vb2_dma_contig_plane_dma_addr(vb, 0);
INIT_LIST_HEAD(&vip_buf->list); INIT_LIST_HEAD(&vip_buf->list);
@ -296,8 +297,9 @@ static int buffer_init(struct vb2_buffer *vb)
static int buffer_prepare(struct vb2_buffer *vb) static int buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue); struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue);
struct vip_buffer *vip_buf = to_vip_buffer(vb); struct vip_buffer *vip_buf = to_vip_buffer(vbuf);
unsigned long size; unsigned long size;
size = vip->format.sizeimage; size = vip->format.sizeimage;
@ -307,14 +309,15 @@ static int buffer_prepare(struct vb2_buffer *vb)
return -EINVAL; return -EINVAL;
} }
vb2_set_plane_payload(&vip_buf->vb, 0, size); vb2_set_plane_payload(&vip_buf->vb.vb2_buf, 0, size);
return 0; return 0;
} }
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue); struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue);
struct vip_buffer *vip_buf = to_vip_buffer(vb); struct vip_buffer *vip_buf = to_vip_buffer(vbuf);
spin_lock(&vip->lock); spin_lock(&vip->lock);
list_add_tail(&vip_buf->list, &vip->buffer_list); list_add_tail(&vip_buf->list, &vip->buffer_list);
@ -329,8 +332,9 @@ static void buffer_queue(struct vb2_buffer *vb)
} }
static void buffer_finish(struct vb2_buffer *vb) static void buffer_finish(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue); struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue);
struct vip_buffer *vip_buf = to_vip_buffer(vb); struct vip_buffer *vip_buf = to_vip_buffer(vbuf);
/* Buffer handled, remove it from the list */ /* Buffer handled, remove it from the list */
spin_lock(&vip->lock); spin_lock(&vip->lock);
@ -370,7 +374,7 @@ static void stop_streaming(struct vb2_queue *vq)
/* Release all active buffers */ /* Release all active buffers */
spin_lock(&vip->lock); spin_lock(&vip->lock);
list_for_each_entry_safe(vip_buf, node, &vip->buffer_list, list) { list_for_each_entry_safe(vip_buf, node, &vip->buffer_list, list) {
vb2_buffer_done(&vip_buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&vip_buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
list_del(&vip_buf->list); list_del(&vip_buf->list);
} }
spin_unlock(&vip->lock); spin_unlock(&vip->lock);
@ -813,9 +817,9 @@ static irqreturn_t vip_irq(int irq, struct sta2x11_vip *vip)
/* Disable acquisition */ /* Disable acquisition */
reg_write(vip, DVP_CTL, reg_read(vip, DVP_CTL) & ~DVP_CTL_ENA); reg_write(vip, DVP_CTL, reg_read(vip, DVP_CTL) & ~DVP_CTL_ENA);
/* Remove the active buffer from the list */ /* Remove the active buffer from the list */
v4l2_get_timestamp(&vip->active->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&vip->active->vb.timestamp);
vip->active->vb.v4l2_buf.sequence = vip->sequence++; vip->active->vb.sequence = vip->sequence++;
vb2_buffer_done(&vip->active->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&vip->active->vb.vb2_buf, VB2_BUF_STATE_DONE);
} }
return IRQ_HANDLED; return IRQ_HANDLED;

19
drivers/media/pci/tw68/tw68-video.c
View File

@ -423,9 +423,10 @@ static int tw68_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
*/ */
static void tw68_buf_queue(struct vb2_buffer *vb) static void tw68_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vb2_queue *vq = vb->vb2_queue; struct vb2_queue *vq = vb->vb2_queue;
struct tw68_dev *dev = vb2_get_drv_priv(vq); struct tw68_dev *dev = vb2_get_drv_priv(vq);
struct tw68_buf *buf = container_of(vb, struct tw68_buf, vb); struct tw68_buf *buf = container_of(vbuf, struct tw68_buf, vb);
struct tw68_buf *prev; struct tw68_buf *prev;
unsigned long flags; unsigned long flags;
@ -457,9 +458,10 @@ static void tw68_buf_queue(struct vb2_buffer *vb)
*/ */
static int tw68_buf_prepare(struct vb2_buffer *vb) static int tw68_buf_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vb2_queue *vq = vb->vb2_queue; struct vb2_queue *vq = vb->vb2_queue;
struct tw68_dev *dev = vb2_get_drv_priv(vq); struct tw68_dev *dev = vb2_get_drv_priv(vq);
struct tw68_buf *buf = container_of(vb, struct tw68_buf, vb); struct tw68_buf *buf = container_of(vbuf, struct tw68_buf, vb);
struct sg_table *dma = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *dma = vb2_dma_sg_plane_desc(vb, 0);
unsigned size, bpl; unsigned size, bpl;
@ -499,9 +501,10 @@ static int tw68_buf_prepare(struct vb2_buffer *vb)
static void tw68_buf_finish(struct vb2_buffer *vb) static void tw68_buf_finish(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vb2_queue *vq = vb->vb2_queue; struct vb2_queue *vq = vb->vb2_queue;
struct tw68_dev *dev = vb2_get_drv_priv(vq); struct tw68_dev *dev = vb2_get_drv_priv(vq);
struct tw68_buf *buf = container_of(vb, struct tw68_buf, vb); struct tw68_buf *buf = container_of(vbuf, struct tw68_buf, vb);
pci_free_consistent(dev->pci, buf->size, buf->cpu, buf->dma); pci_free_consistent(dev->pci, buf->size, buf->cpu, buf->dma);
} }
@ -528,7 +531,7 @@ static void tw68_stop_streaming(struct vb2_queue *q)
container_of(dev->active.next, struct tw68_buf, list); container_of(dev->active.next, struct tw68_buf, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
} }
@ -1012,10 +1015,10 @@ void tw68_irq_video_done(struct tw68_dev *dev, unsigned long status)
buf = list_entry(dev->active.next, struct tw68_buf, list); buf = list_entry(dev->active.next, struct tw68_buf, list);
list_del(&buf->list); list_del(&buf->list);
spin_unlock(&dev->slock); spin_unlock(&dev->slock);
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.timestamp);
buf->vb.v4l2_buf.field = dev->field; buf->vb.field = dev->field;
buf->vb.v4l2_buf.sequence = dev->seqnr++; buf->vb.sequence = dev->seqnr++;
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
status &= ~(TW68_DMAPI); status &= ~(TW68_DMAPI);
if (0 == status) if (0 == status)
return; return;

3
drivers/media/pci/tw68/tw68.h
View File

@ -36,6 +36,7 @@
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include <media/v4l2-ctrls.h> #include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-dma-sg.h> #include <media/videobuf2-dma-sg.h>
#include "tw68-reg.h" #include "tw68-reg.h"
@ -118,7 +119,7 @@ struct tw68_dev; /* forward delclaration */
/* buffer for one video/vbi/ts frame */ /* buffer for one video/vbi/ts frame */
struct tw68_buf { struct tw68_buf {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
unsigned int size; unsigned int size;

35
drivers/media/platform/am437x/am437x-vpfe.c
View File

@ -307,7 +307,8 @@ static inline struct vpfe_device *to_vpfe(struct vpfe_ccdc *ccdc)
return container_of(ccdc, struct vpfe_device, ccdc); return container_of(ccdc, struct vpfe_device, ccdc);
} }
static inline struct vpfe_cap_buffer *to_vpfe_buffer(struct vb2_buffer *vb) static inline
struct vpfe_cap_buffer *to_vpfe_buffer(struct vb2_v4l2_buffer *vb)
{ {
return container_of(vb, struct vpfe_cap_buffer, vb); return container_of(vb, struct vpfe_cap_buffer, vb);
} }
@ -1257,14 +1258,14 @@ static inline void vpfe_schedule_next_buffer(struct vpfe_device *vpfe)
list_del(&vpfe->next_frm->list); list_del(&vpfe->next_frm->list);
vpfe_set_sdr_addr(&vpfe->ccdc, vpfe_set_sdr_addr(&vpfe->ccdc,
vb2_dma_contig_plane_dma_addr(&vpfe->next_frm->vb, 0)); vb2_dma_contig_plane_dma_addr(&vpfe->next_frm->vb.vb2_buf, 0));
} }
static inline void vpfe_schedule_bottom_field(struct vpfe_device *vpfe) static inline void vpfe_schedule_bottom_field(struct vpfe_device *vpfe)
{ {
unsigned long addr; unsigned long addr;
addr = vb2_dma_contig_plane_dma_addr(&vpfe->next_frm->vb, 0) + addr = vb2_dma_contig_plane_dma_addr(&vpfe->next_frm->vb.vb2_buf, 0) +
vpfe->field_off; vpfe->field_off;
vpfe_set_sdr_addr(&vpfe->ccdc, addr); vpfe_set_sdr_addr(&vpfe->ccdc, addr);
@ -1280,10 +1281,10 @@ static inline void vpfe_schedule_bottom_field(struct vpfe_device *vpfe)
*/ */
static inline void vpfe_process_buffer_complete(struct vpfe_device *vpfe) static inline void vpfe_process_buffer_complete(struct vpfe_device *vpfe)
{ {
v4l2_get_timestamp(&vpfe->cur_frm->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&vpfe->cur_frm->vb.timestamp);
vpfe->cur_frm->vb.v4l2_buf.field = vpfe->fmt.fmt.pix.field; vpfe->cur_frm->vb.field = vpfe->fmt.fmt.pix.field;
vpfe->cur_frm->vb.v4l2_buf.sequence = vpfe->sequence++; vpfe->cur_frm->vb.sequence = vpfe->sequence++;
vb2_buffer_done(&vpfe->cur_frm->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&vpfe->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
vpfe->cur_frm = vpfe->next_frm; vpfe->cur_frm = vpfe->next_frm;
} }
@ -1942,6 +1943,7 @@ static int vpfe_queue_setup(struct vb2_queue *vq,
*/ */
static int vpfe_buffer_prepare(struct vb2_buffer *vb) static int vpfe_buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vpfe_device *vpfe = vb2_get_drv_priv(vb->vb2_queue); struct vpfe_device *vpfe = vb2_get_drv_priv(vb->vb2_queue);
vb2_set_plane_payload(vb, 0, vpfe->fmt.fmt.pix.sizeimage); vb2_set_plane_payload(vb, 0, vpfe->fmt.fmt.pix.sizeimage);
@ -1949,7 +1951,7 @@ static int vpfe_buffer_prepare(struct vb2_buffer *vb)
if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0)) if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
return -EINVAL; return -EINVAL;
vb->v4l2_buf.field = vpfe->fmt.fmt.pix.field; vbuf->field = vpfe->fmt.fmt.pix.field;
return 0; return 0;
} }
@ -1960,8 +1962,9 @@ static int vpfe_buffer_prepare(struct vb2_buffer *vb)
*/ */
static void vpfe_buffer_queue(struct vb2_buffer *vb) static void vpfe_buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vpfe_device *vpfe = vb2_get_drv_priv(vb->vb2_queue); struct vpfe_device *vpfe = vb2_get_drv_priv(vb->vb2_queue);
struct vpfe_cap_buffer *buf = to_vpfe_buffer(vb); struct vpfe_cap_buffer *buf = to_vpfe_buffer(vbuf);
unsigned long flags = 0; unsigned long flags = 0;
/* add the buffer to the DMA queue */ /* add the buffer to the DMA queue */
@ -2006,7 +2009,7 @@ static int vpfe_start_streaming(struct vb2_queue *vq, unsigned int count)
list_del(&vpfe->cur_frm->list); list_del(&vpfe->cur_frm->list);
spin_unlock_irqrestore(&vpfe->dma_queue_lock, flags); spin_unlock_irqrestore(&vpfe->dma_queue_lock, flags);
addr = vb2_dma_contig_plane_dma_addr(&vpfe->cur_frm->vb, 0); addr = vb2_dma_contig_plane_dma_addr(&vpfe->cur_frm->vb.vb2_buf, 0);
vpfe_set_sdr_addr(&vpfe->ccdc, (unsigned long)(addr)); vpfe_set_sdr_addr(&vpfe->ccdc, (unsigned long)(addr));
@ -2023,7 +2026,7 @@ static int vpfe_start_streaming(struct vb2_queue *vq, unsigned int count)
err: err:
list_for_each_entry_safe(buf, tmp, &vpfe->dma_queue, list) { list_for_each_entry_safe(buf, tmp, &vpfe->dma_queue, list) {
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
} }
return ret; return ret;
@ -2055,13 +2058,14 @@ static void vpfe_stop_streaming(struct vb2_queue *vq)
/* release all active buffers */ /* release all active buffers */
spin_lock_irqsave(&vpfe->dma_queue_lock, flags); spin_lock_irqsave(&vpfe->dma_queue_lock, flags);
if (vpfe->cur_frm == vpfe->next_frm) { if (vpfe->cur_frm == vpfe->next_frm) {
vb2_buffer_done(&vpfe->cur_frm->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&vpfe->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
} else { } else {
if (vpfe->cur_frm != NULL) if (vpfe->cur_frm != NULL)
vb2_buffer_done(&vpfe->cur_frm->vb, vb2_buffer_done(&vpfe->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR); VB2_BUF_STATE_ERROR);
if (vpfe->next_frm != NULL) if (vpfe->next_frm != NULL)
vb2_buffer_done(&vpfe->next_frm->vb, vb2_buffer_done(&vpfe->next_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR); VB2_BUF_STATE_ERROR);
} }
@ -2069,7 +2073,8 @@ static void vpfe_stop_streaming(struct vb2_queue *vq)
vpfe->next_frm = list_entry(vpfe->dma_queue.next, vpfe->next_frm = list_entry(vpfe->dma_queue.next,
struct vpfe_cap_buffer, list); struct vpfe_cap_buffer, list);
list_del(&vpfe->next_frm->list); list_del(&vpfe->next_frm->list);
vb2_buffer_done(&vpfe->next_frm->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&vpfe->next_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&vpfe->dma_queue_lock, flags); spin_unlock_irqrestore(&vpfe->dma_queue_lock, flags);
} }

3
drivers/media/platform/am437x/am437x-vpfe.h
View File

@ -31,6 +31,7 @@
#include <media/v4l2-dev.h> #include <media/v4l2-dev.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-dma-contig.h> #include <media/videobuf2-dma-contig.h>
#include "am437x-vpfe_regs.h" #include "am437x-vpfe_regs.h"
@ -104,7 +105,7 @@ struct vpfe_config {
}; };
struct vpfe_cap_buffer { struct vpfe_cap_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };

34
drivers/media/platform/blackfin/bfin_capture.c
View File

@ -54,7 +54,7 @@ struct bcap_format {
}; };
struct bcap_buffer { struct bcap_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };
@ -149,7 +149,7 @@ static const struct bcap_format bcap_formats[] = {
static irqreturn_t bcap_isr(int irq, void *dev_id); static irqreturn_t bcap_isr(int irq, void *dev_id);
static struct bcap_buffer *to_bcap_vb(struct vb2_buffer *vb) static struct bcap_buffer *to_bcap_vb(struct vb2_v4l2_buffer *vb)
{ {
return container_of(vb, struct bcap_buffer, vb); return container_of(vb, struct bcap_buffer, vb);
} }
@ -223,6 +223,7 @@ static int bcap_queue_setup(struct vb2_queue *vq,
static int bcap_buffer_prepare(struct vb2_buffer *vb) static int bcap_buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue); struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue);
unsigned long size = bcap_dev->fmt.sizeimage; unsigned long size = bcap_dev->fmt.sizeimage;
@ -233,15 +234,16 @@ static int bcap_buffer_prepare(struct vb2_buffer *vb)
} }
vb2_set_plane_payload(vb, 0, size); vb2_set_plane_payload(vb, 0, size);
vb->v4l2_buf.field = bcap_dev->fmt.field; vbuf->field = bcap_dev->fmt.field;
return 0; return 0;
} }
static void bcap_buffer_queue(struct vb2_buffer *vb) static void bcap_buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue); struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue);
struct bcap_buffer *buf = to_bcap_vb(vb); struct bcap_buffer *buf = to_bcap_vb(vbuf);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&bcap_dev->lock, flags); spin_lock_irqsave(&bcap_dev->lock, flags);
@ -251,8 +253,9 @@ static void bcap_buffer_queue(struct vb2_buffer *vb)
static void bcap_buffer_cleanup(struct vb2_buffer *vb) static void bcap_buffer_cleanup(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue); struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue);
struct bcap_buffer *buf = to_bcap_vb(vb); struct bcap_buffer *buf = to_bcap_vb(vbuf);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&bcap_dev->lock, flags); spin_lock_irqsave(&bcap_dev->lock, flags);
@ -333,7 +336,8 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count)
struct bcap_buffer, list); struct bcap_buffer, list);
/* remove buffer from the dma queue */ /* remove buffer from the dma queue */
list_del_init(&bcap_dev->cur_frm->list); list_del_init(&bcap_dev->cur_frm->list);
addr = vb2_dma_contig_plane_dma_addr(&bcap_dev->cur_frm->vb, 0); addr = vb2_dma_contig_plane_dma_addr(&bcap_dev->cur_frm->vb.vb2_buf,
0);
/* update DMA address */ /* update DMA address */
ppi->ops->update_addr(ppi, (unsigned long)addr); ppi->ops->update_addr(ppi, (unsigned long)addr);
/* enable ppi */ /* enable ppi */
@ -344,7 +348,7 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count)
err: err:
list_for_each_entry_safe(buf, tmp, &bcap_dev->dma_queue, list) { list_for_each_entry_safe(buf, tmp, &bcap_dev->dma_queue, list) {
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
} }
return ret; return ret;
@ -367,13 +371,15 @@ static void bcap_stop_streaming(struct vb2_queue *vq)
/* release all active buffers */ /* release all active buffers */
if (bcap_dev->cur_frm) if (bcap_dev->cur_frm)
vb2_buffer_done(&bcap_dev->cur_frm->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&bcap_dev->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
while (!list_empty(&bcap_dev->dma_queue)) { while (!list_empty(&bcap_dev->dma_queue)) {
bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next, bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next,
struct bcap_buffer, list); struct bcap_buffer, list);
list_del_init(&bcap_dev->cur_frm->list); list_del_init(&bcap_dev->cur_frm->list);
vb2_buffer_done(&bcap_dev->cur_frm->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&bcap_dev->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
} }
} }
@ -392,18 +398,19 @@ static irqreturn_t bcap_isr(int irq, void *dev_id)
{ {
struct ppi_if *ppi = dev_id; struct ppi_if *ppi = dev_id;
struct bcap_device *bcap_dev = ppi->priv; struct bcap_device *bcap_dev = ppi->priv;
struct vb2_buffer *vb = &bcap_dev->cur_frm->vb; struct vb2_v4l2_buffer *vbuf = &bcap_dev->cur_frm->vb;
struct vb2_buffer *vb = &vbuf->vb2_buf;
dma_addr_t addr; dma_addr_t addr;
spin_lock(&bcap_dev->lock); spin_lock(&bcap_dev->lock);
if (!list_empty(&bcap_dev->dma_queue)) { if (!list_empty(&bcap_dev->dma_queue)) {
v4l2_get_timestamp(&vb->v4l2_buf.timestamp); v4l2_get_timestamp(&vbuf->timestamp);
if (ppi->err) { if (ppi->err) {
vb2_buffer_done(vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
ppi->err = false; ppi->err = false;
} else { } else {
vb->v4l2_buf.sequence = bcap_dev->sequence++; vbuf->sequence = bcap_dev->sequence++;
vb2_buffer_done(vb, VB2_BUF_STATE_DONE); vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
} }
bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next, bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next,
@ -420,7 +427,8 @@ static irqreturn_t bcap_isr(int irq, void *dev_id)
if (bcap_dev->stop) { if (bcap_dev->stop) {
complete(&bcap_dev->comp); complete(&bcap_dev->comp);
} else { } else {
addr = vb2_dma_contig_plane_dma_addr(&bcap_dev->cur_frm->vb, 0); addr = vb2_dma_contig_plane_dma_addr(
&bcap_dev->cur_frm->vb.vb2_buf, 0);
ppi->ops->update_addr(ppi, (unsigned long)addr); ppi->ops->update_addr(ppi, (unsigned long)addr);
ppi->ops->start(ppi); ppi->ops->start(ppi);
} }

133
drivers/media/platform/coda/coda-bit.c
View File

@ -179,31 +179,32 @@ static void coda_kfifo_sync_to_device_write(struct coda_ctx *ctx)
} }
static int coda_bitstream_queue(struct coda_ctx *ctx, static int coda_bitstream_queue(struct coda_ctx *ctx,
struct vb2_buffer *src_buf) struct vb2_v4l2_buffer *src_buf)
{ {
u32 src_size = vb2_get_plane_payload(src_buf, 0); u32 src_size = vb2_get_plane_payload(&src_buf->vb2_buf, 0);
u32 n; u32 n;
n = kfifo_in(&ctx->bitstream_fifo, vb2_plane_vaddr(src_buf, 0), n = kfifo_in(&ctx->bitstream_fifo,
src_size); vb2_plane_vaddr(&src_buf->vb2_buf, 0), src_size);
if (n < src_size) if (n < src_size)
return -ENOSPC; return -ENOSPC;
src_buf->v4l2_buf.sequence = ctx->qsequence++; src_buf->sequence = ctx->qsequence++;
return 0; return 0;
} }
static bool coda_bitstream_try_queue(struct coda_ctx *ctx, static bool coda_bitstream_try_queue(struct coda_ctx *ctx,
struct vb2_buffer *src_buf) struct vb2_v4l2_buffer *src_buf)
{ {
int ret; int ret;
if (coda_get_bitstream_payload(ctx) + if (coda_get_bitstream_payload(ctx) +
vb2_get_plane_payload(src_buf, 0) + 512 >= ctx->bitstream.size) vb2_get_plane_payload(&src_buf->vb2_buf, 0) + 512 >=
ctx->bitstream.size)
return false; return false;
if (vb2_plane_vaddr(src_buf, 0) == NULL) { if (vb2_plane_vaddr(&src_buf->vb2_buf, 0) == NULL) {
v4l2_err(&ctx->dev->v4l2_dev, "trying to queue empty buffer\n"); v4l2_err(&ctx->dev->v4l2_dev, "trying to queue empty buffer\n");
return true; return true;
} }
@ -224,7 +225,7 @@ static bool coda_bitstream_try_queue(struct coda_ctx *ctx,
void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming) void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming)
{ {
struct vb2_buffer *src_buf; struct vb2_v4l2_buffer *src_buf;
struct coda_buffer_meta *meta; struct coda_buffer_meta *meta;
unsigned long flags; unsigned long flags;
u32 start; u32 start;
@ -257,7 +258,7 @@ void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming)
} }
/* Dump empty buffers */ /* Dump empty buffers */
if (!vb2_get_plane_payload(src_buf, 0)) { if (!vb2_get_plane_payload(&src_buf->vb2_buf, 0)) {
src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx); src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);
continue; continue;
@ -276,9 +277,9 @@ void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming)
meta = kmalloc(sizeof(*meta), GFP_KERNEL); meta = kmalloc(sizeof(*meta), GFP_KERNEL);
if (meta) { if (meta) {
meta->sequence = src_buf->v4l2_buf.sequence; meta->sequence = src_buf->sequence;
meta->timecode = src_buf->v4l2_buf.timecode; meta->timecode = src_buf->timecode;
meta->timestamp = src_buf->v4l2_buf.timestamp; meta->timestamp = src_buf->timestamp;
meta->start = start; meta->start = start;
meta->end = ctx->bitstream_fifo.kfifo.in & meta->end = ctx->bitstream_fifo.kfifo.in &
ctx->bitstream_fifo.kfifo.mask; ctx->bitstream_fifo.kfifo.mask;
@ -483,20 +484,21 @@ err:
return ret; return ret;
} }
static int coda_encode_header(struct coda_ctx *ctx, struct vb2_buffer *buf, static int coda_encode_header(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
int header_code, u8 *header, int *size) int header_code, u8 *header, int *size)
{ {
struct vb2_buffer *vb = &buf->vb2_buf;
struct coda_dev *dev = ctx->dev; struct coda_dev *dev = ctx->dev;
size_t bufsize; size_t bufsize;
int ret; int ret;
int i; int i;
if (dev->devtype->product == CODA_960) if (dev->devtype->product == CODA_960)
memset(vb2_plane_vaddr(buf, 0), 0, 64); memset(vb2_plane_vaddr(vb, 0), 0, 64);
coda_write(dev, vb2_dma_contig_plane_dma_addr(buf, 0), coda_write(dev, vb2_dma_contig_plane_dma_addr(vb, 0),
CODA_CMD_ENC_HEADER_BB_START); CODA_CMD_ENC_HEADER_BB_START);
bufsize = vb2_plane_size(buf, 0); bufsize = vb2_plane_size(vb, 0);
if (dev->devtype->product == CODA_960) if (dev->devtype->product == CODA_960)
bufsize /= 1024; bufsize /= 1024;
coda_write(dev, bufsize, CODA_CMD_ENC_HEADER_BB_SIZE); coda_write(dev, bufsize, CODA_CMD_ENC_HEADER_BB_SIZE);
@ -509,14 +511,14 @@ static int coda_encode_header(struct coda_ctx *ctx, struct vb2_buffer *buf,
if (dev->devtype->product == CODA_960) { if (dev->devtype->product == CODA_960) {
for (i = 63; i > 0; i--) for (i = 63; i > 0; i--)
if (((char *)vb2_plane_vaddr(buf, 0))[i] != 0) if (((char *)vb2_plane_vaddr(vb, 0))[i] != 0)
break; break;
*size = i + 1; *size = i + 1;
} else { } else {
*size = coda_read(dev, CODA_REG_BIT_WR_PTR(ctx->reg_idx)) - *size = coda_read(dev, CODA_REG_BIT_WR_PTR(ctx->reg_idx)) -
coda_read(dev, CODA_CMD_ENC_HEADER_BB_START); coda_read(dev, CODA_CMD_ENC_HEADER_BB_START);
} }
memcpy(header, vb2_plane_vaddr(buf, 0), *size); memcpy(header, vb2_plane_vaddr(vb, 0), *size);
return 0; return 0;
} }
@ -799,7 +801,7 @@ static int coda_start_encoding(struct coda_ctx *ctx)
struct v4l2_device *v4l2_dev = &dev->v4l2_dev; struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
struct coda_q_data *q_data_src, *q_data_dst; struct coda_q_data *q_data_src, *q_data_dst;
u32 bitstream_buf, bitstream_size; u32 bitstream_buf, bitstream_size;
struct vb2_buffer *buf; struct vb2_v4l2_buffer *buf;
int gamma, ret, value; int gamma, ret, value;
u32 dst_fourcc; u32 dst_fourcc;
int num_fb; int num_fb;
@ -810,7 +812,7 @@ static int coda_start_encoding(struct coda_ctx *ctx)
dst_fourcc = q_data_dst->fourcc; dst_fourcc = q_data_dst->fourcc;
buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
bitstream_buf = vb2_dma_contig_plane_dma_addr(buf, 0); bitstream_buf = vb2_dma_contig_plane_dma_addr(&buf->vb2_buf, 0);
bitstream_size = q_data_dst->sizeimage; bitstream_size = q_data_dst->sizeimage;
if (!coda_is_initialized(dev)) { if (!coda_is_initialized(dev)) {
@ -1185,7 +1187,7 @@ out:
static int coda_prepare_encode(struct coda_ctx *ctx) static int coda_prepare_encode(struct coda_ctx *ctx)
{ {
struct coda_q_data *q_data_src, *q_data_dst; struct coda_q_data *q_data_src, *q_data_dst;
struct vb2_buffer *src_buf, *dst_buf; struct vb2_v4l2_buffer *src_buf, *dst_buf;
struct coda_dev *dev = ctx->dev; struct coda_dev *dev = ctx->dev;
int force_ipicture; int force_ipicture;
int quant_param = 0; int quant_param = 0;
@ -1200,8 +1202,8 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE); q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
dst_fourcc = q_data_dst->fourcc; dst_fourcc = q_data_dst->fourcc;
src_buf->v4l2_buf.sequence = ctx->osequence; src_buf->sequence = ctx->osequence;
dst_buf->v4l2_buf.sequence = ctx->osequence; dst_buf->sequence = ctx->osequence;
ctx->osequence++; ctx->osequence++;
/* /*
@ -1209,12 +1211,12 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
* frame as IDR. This is a problem for some decoders that can't * frame as IDR. This is a problem for some decoders that can't
* recover when a frame is lost. * recover when a frame is lost.
*/ */
if (src_buf->v4l2_buf.sequence % ctx->params.gop_size) { if (src_buf->sequence % ctx->params.gop_size) {
src_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_PFRAME; src_buf->flags |= V4L2_BUF_FLAG_PFRAME;
src_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_KEYFRAME; src_buf->flags &= ~V4L2_BUF_FLAG_KEYFRAME;
} else { } else {
src_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME; src_buf->flags |= V4L2_BUF_FLAG_KEYFRAME;
src_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_PFRAME; src_buf->flags &= ~V4L2_BUF_FLAG_PFRAME;
} }
if (dev->devtype->product == CODA_960) if (dev->devtype->product == CODA_960)
@ -1224,9 +1226,9 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
* Copy headers at the beginning of the first frame for H.264 only. * Copy headers at the beginning of the first frame for H.264 only.
* In MPEG4 they are already copied by the coda. * In MPEG4 they are already copied by the coda.
*/ */
if (src_buf->v4l2_buf.sequence == 0) { if (src_buf->sequence == 0) {
pic_stream_buffer_addr = pic_stream_buffer_addr =
vb2_dma_contig_plane_dma_addr(dst_buf, 0) + vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0) +
ctx->vpu_header_size[0] + ctx->vpu_header_size[0] +
ctx->vpu_header_size[1] + ctx->vpu_header_size[1] +
ctx->vpu_header_size[2]; ctx->vpu_header_size[2];
@ -1234,20 +1236,21 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
ctx->vpu_header_size[0] - ctx->vpu_header_size[0] -
ctx->vpu_header_size[1] - ctx->vpu_header_size[1] -
ctx->vpu_header_size[2]; ctx->vpu_header_size[2];
memcpy(vb2_plane_vaddr(dst_buf, 0), memcpy(vb2_plane_vaddr(&dst_buf->vb2_buf, 0),
&ctx->vpu_header[0][0], ctx->vpu_header_size[0]); &ctx->vpu_header[0][0], ctx->vpu_header_size[0]);
memcpy(vb2_plane_vaddr(dst_buf, 0) + ctx->vpu_header_size[0], memcpy(vb2_plane_vaddr(&dst_buf->vb2_buf, 0)
&ctx->vpu_header[1][0], ctx->vpu_header_size[1]); + ctx->vpu_header_size[0], &ctx->vpu_header[1][0],
memcpy(vb2_plane_vaddr(dst_buf, 0) + ctx->vpu_header_size[0] + ctx->vpu_header_size[1]);
ctx->vpu_header_size[1], &ctx->vpu_header[2][0], memcpy(vb2_plane_vaddr(&dst_buf->vb2_buf, 0)
ctx->vpu_header_size[2]); + ctx->vpu_header_size[0] + ctx->vpu_header_size[1],
&ctx->vpu_header[2][0], ctx->vpu_header_size[2]);
} else { } else {
pic_stream_buffer_addr = pic_stream_buffer_addr =
vb2_dma_contig_plane_dma_addr(dst_buf, 0); vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
pic_stream_buffer_size = q_data_dst->sizeimage; pic_stream_buffer_size = q_data_dst->sizeimage;
} }
if (src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) { if (src_buf->flags & V4L2_BUF_FLAG_KEYFRAME) {
force_ipicture = 1; force_ipicture = 1;
switch (dst_fourcc) { switch (dst_fourcc) {
case V4L2_PIX_FMT_H264: case V4L2_PIX_FMT_H264:
@ -1324,7 +1327,7 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
static void coda_finish_encode(struct coda_ctx *ctx) static void coda_finish_encode(struct coda_ctx *ctx)
{ {
struct vb2_buffer *src_buf, *dst_buf; struct vb2_v4l2_buffer *src_buf, *dst_buf;
struct coda_dev *dev = ctx->dev; struct coda_dev *dev = ctx->dev;
u32 wr_ptr, start_ptr; u32 wr_ptr, start_ptr;
@ -1338,13 +1341,13 @@ static void coda_finish_encode(struct coda_ctx *ctx)
wr_ptr = coda_read(dev, CODA_REG_BIT_WR_PTR(ctx->reg_idx)); wr_ptr = coda_read(dev, CODA_REG_BIT_WR_PTR(ctx->reg_idx));
/* Calculate bytesused field */ /* Calculate bytesused field */
if (dst_buf->v4l2_buf.sequence == 0) { if (dst_buf->sequence == 0) {
vb2_set_plane_payload(dst_buf, 0, wr_ptr - start_ptr + vb2_set_plane_payload(&dst_buf->vb2_buf, 0,
ctx->vpu_header_size[0] + ctx->vpu_header_size[0] +
ctx->vpu_header_size[1] + ctx->vpu_header_size[1] +
ctx->vpu_header_size[2]); ctx->vpu_header_size[2]);
} else { } else {
vb2_set_plane_payload(dst_buf, 0, wr_ptr - start_ptr); vb2_set_plane_payload(&dst_buf->vb2_buf, 0, wr_ptr - start_ptr);
} }
v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev, "frame size = %u\n", v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev, "frame size = %u\n",
@ -1354,18 +1357,18 @@ static void coda_finish_encode(struct coda_ctx *ctx)
coda_read(dev, CODA_RET_ENC_PIC_FLAG); coda_read(dev, CODA_RET_ENC_PIC_FLAG);
if (coda_read(dev, CODA_RET_ENC_PIC_TYPE) == 0) { if (coda_read(dev, CODA_RET_ENC_PIC_TYPE) == 0) {
dst_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME; dst_buf->flags |= V4L2_BUF_FLAG_KEYFRAME;
dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_PFRAME; dst_buf->flags &= ~V4L2_BUF_FLAG_PFRAME;
} else { } else {
dst_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_PFRAME; dst_buf->flags |= V4L2_BUF_FLAG_PFRAME;
dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_KEYFRAME; dst_buf->flags &= ~V4L2_BUF_FLAG_KEYFRAME;
} }
dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp; dst_buf->timestamp = src_buf->timestamp;
dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; dst_buf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_buf->v4l2_buf.flags |= dst_buf->flags |=
src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; src_buf->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode; dst_buf->timecode = src_buf->timecode;
v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);
@ -1378,8 +1381,8 @@ static void coda_finish_encode(struct coda_ctx *ctx)
v4l2_dbg(1, coda_debug, &dev->v4l2_dev, v4l2_dbg(1, coda_debug, &dev->v4l2_dev,
"job finished: encoding frame (%d) (%s)\n", "job finished: encoding frame (%d) (%s)\n",
dst_buf->v4l2_buf.sequence, dst_buf->sequence,
(dst_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) ? (dst_buf->flags & V4L2_BUF_FLAG_KEYFRAME) ?
"KEYFRAME" : "PFRAME"); "KEYFRAME" : "PFRAME");
} }
@ -1716,7 +1719,7 @@ static int coda_start_decoding(struct coda_ctx *ctx)
static int coda_prepare_decode(struct coda_ctx *ctx) static int coda_prepare_decode(struct coda_ctx *ctx)
{ {
struct vb2_buffer *dst_buf; struct vb2_v4l2_buffer *dst_buf;
struct coda_dev *dev = ctx->dev; struct coda_dev *dev = ctx->dev;
struct coda_q_data *q_data_dst; struct coda_q_data *q_data_dst;
struct coda_buffer_meta *meta; struct coda_buffer_meta *meta;
@ -1763,7 +1766,7 @@ static int coda_prepare_decode(struct coda_ctx *ctx)
* well as the rotator buffer output. * well as the rotator buffer output.
* ROT_INDEX needs to be < 0x40, but > ctx->num_internal_frames. * ROT_INDEX needs to be < 0x40, but > ctx->num_internal_frames.
*/ */
coda_write(dev, CODA_MAX_FRAMEBUFFERS + dst_buf->v4l2_buf.index, coda_write(dev, CODA_MAX_FRAMEBUFFERS + dst_buf->vb2_buf.index,
CODA9_CMD_DEC_PIC_ROT_INDEX); CODA9_CMD_DEC_PIC_ROT_INDEX);
reg_addr = CODA9_CMD_DEC_PIC_ROT_ADDR_Y; reg_addr = CODA9_CMD_DEC_PIC_ROT_ADDR_Y;
@ -1838,7 +1841,7 @@ static void coda_finish_decode(struct coda_ctx *ctx)
struct coda_dev *dev = ctx->dev; struct coda_dev *dev = ctx->dev;
struct coda_q_data *q_data_src; struct coda_q_data *q_data_src;
struct coda_q_data *q_data_dst; struct coda_q_data *q_data_dst;
struct vb2_buffer *dst_buf; struct vb2_v4l2_buffer *dst_buf;
struct coda_buffer_meta *meta; struct coda_buffer_meta *meta;
unsigned long payload; unsigned long payload;
unsigned long flags; unsigned long flags;
@ -2029,15 +2032,15 @@ static void coda_finish_decode(struct coda_ctx *ctx)
if (ctx->display_idx >= 0 && if (ctx->display_idx >= 0 &&
ctx->display_idx < ctx->num_internal_frames) { ctx->display_idx < ctx->num_internal_frames) {
dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
dst_buf->v4l2_buf.sequence = ctx->osequence++; dst_buf->sequence = ctx->osequence++;
dst_buf->v4l2_buf.flags &= ~(V4L2_BUF_FLAG_KEYFRAME | dst_buf->flags &= ~(V4L2_BUF_FLAG_KEYFRAME |
V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_PFRAME |
V4L2_BUF_FLAG_BFRAME); V4L2_BUF_FLAG_BFRAME);
dst_buf->v4l2_buf.flags |= ctx->frame_types[ctx->display_idx]; dst_buf->flags |= ctx->frame_types[ctx->display_idx];
meta = &ctx->frame_metas[ctx->display_idx]; meta = &ctx->frame_metas[ctx->display_idx];
dst_buf->v4l2_buf.timecode = meta->timecode; dst_buf->timecode = meta->timecode;
dst_buf->v4l2_buf.timestamp = meta->timestamp; dst_buf->timestamp = meta->timestamp;
trace_coda_dec_rot_done(ctx, dst_buf, meta); trace_coda_dec_rot_done(ctx, dst_buf, meta);
@ -2052,15 +2055,15 @@ static void coda_finish_decode(struct coda_ctx *ctx)
payload = width * height * 2; payload = width * height * 2;
break; break;
} }
vb2_set_plane_payload(dst_buf, 0, payload); vb2_set_plane_payload(&dst_buf->vb2_buf, 0, payload);
coda_m2m_buf_done(ctx, dst_buf, ctx->frame_errors[display_idx] ? coda_m2m_buf_done(ctx, dst_buf, ctx->frame_errors[display_idx] ?
VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
v4l2_dbg(1, coda_debug, &dev->v4l2_dev, v4l2_dbg(1, coda_debug, &dev->v4l2_dev,
"job finished: decoding frame (%d) (%s)\n", "job finished: decoding frame (%d) (%s)\n",
dst_buf->v4l2_buf.sequence, dst_buf->sequence,
(dst_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) ? (dst_buf->flags & V4L2_BUF_FLAG_KEYFRAME) ?
"KEYFRAME" : "PFRAME"); "KEYFRAME" : "PFRAME");
} else { } else {
v4l2_dbg(1, coda_debug, &dev->v4l2_dev, v4l2_dbg(1, coda_debug, &dev->v4l2_dev,

21
drivers/media/platform/coda/coda-common.c
View File

@ -84,9 +84,9 @@ unsigned int coda_read(struct coda_dev *dev, u32 reg)
} }
void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data, void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data,
struct vb2_buffer *buf, unsigned int reg_y) struct vb2_v4l2_buffer *buf, unsigned int reg_y)
{ {
u32 base_y = vb2_dma_contig_plane_dma_addr(buf, 0); u32 base_y = vb2_dma_contig_plane_dma_addr(&buf->vb2_buf, 0);
u32 base_cb, base_cr; u32 base_cb, base_cr;
switch (q_data->fourcc) { switch (q_data->fourcc) {
@ -684,17 +684,17 @@ static int coda_qbuf(struct file *file, void *priv,
} }
static bool coda_buf_is_end_of_stream(struct coda_ctx *ctx, static bool coda_buf_is_end_of_stream(struct coda_ctx *ctx,
struct vb2_buffer *buf) struct vb2_v4l2_buffer *buf)
{ {
struct vb2_queue *src_vq; struct vb2_queue *src_vq;
src_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT); src_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
return ((ctx->bit_stream_param & CODA_BIT_STREAM_END_FLAG) && return ((ctx->bit_stream_param & CODA_BIT_STREAM_END_FLAG) &&
(buf->v4l2_buf.sequence == (ctx->qsequence - 1))); (buf->sequence == (ctx->qsequence - 1)));
} }
void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_buffer *buf, void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
enum vb2_buffer_state state) enum vb2_buffer_state state)
{ {
const struct v4l2_event eos_event = { const struct v4l2_event eos_event = {
@ -702,7 +702,7 @@ void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_buffer *buf,
}; };
if (coda_buf_is_end_of_stream(ctx, buf)) { if (coda_buf_is_end_of_stream(ctx, buf)) {
buf->v4l2_buf.flags |= V4L2_BUF_FLAG_LAST; buf->flags |= V4L2_BUF_FLAG_LAST;
v4l2_event_queue_fh(&ctx->fh, &eos_event); v4l2_event_queue_fh(&ctx->fh, &eos_event);
} }
@ -1175,6 +1175,7 @@ static int coda_buf_prepare(struct vb2_buffer *vb)
static void coda_buf_queue(struct vb2_buffer *vb) static void coda_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct coda_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct coda_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
struct vb2_queue *vq = vb->vb2_queue; struct vb2_queue *vq = vb->vb2_queue;
struct coda_q_data *q_data; struct coda_q_data *q_data;
@ -1193,12 +1194,12 @@ static void coda_buf_queue(struct vb2_buffer *vb)
if (vb2_get_plane_payload(vb, 0) == 0) if (vb2_get_plane_payload(vb, 0) == 0)
coda_bit_stream_end_flag(ctx); coda_bit_stream_end_flag(ctx);
mutex_lock(&ctx->bitstream_mutex); mutex_lock(&ctx->bitstream_mutex);
v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb); v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
if (vb2_is_streaming(vb->vb2_queue)) if (vb2_is_streaming(vb->vb2_queue))
coda_fill_bitstream(ctx, true); coda_fill_bitstream(ctx, true);
mutex_unlock(&ctx->bitstream_mutex); mutex_unlock(&ctx->bitstream_mutex);
} else { } else {
v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb); v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
} }
} }
@ -1247,7 +1248,7 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
struct coda_ctx *ctx = vb2_get_drv_priv(q); struct coda_ctx *ctx = vb2_get_drv_priv(q);
struct v4l2_device *v4l2_dev = &ctx->dev->v4l2_dev; struct v4l2_device *v4l2_dev = &ctx->dev->v4l2_dev;
struct coda_q_data *q_data_src, *q_data_dst; struct coda_q_data *q_data_src, *q_data_dst;
struct vb2_buffer *buf; struct vb2_v4l2_buffer *buf;
int ret = 0; int ret = 0;
q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT); q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
@ -1338,7 +1339,7 @@ static void coda_stop_streaming(struct vb2_queue *q)
{ {
struct coda_ctx *ctx = vb2_get_drv_priv(q); struct coda_ctx *ctx = vb2_get_drv_priv(q);
struct coda_dev *dev = ctx->dev; struct coda_dev *dev = ctx->dev;
struct vb2_buffer *buf; struct vb2_v4l2_buffer *buf;
unsigned long flags; unsigned long flags;
bool stop; bool stop;

6
drivers/media/platform/coda/coda-jpeg.c
View File

@ -178,12 +178,12 @@ int coda_jpeg_write_tables(struct coda_ctx *ctx)
return 0; return 0;
} }
bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_buffer *vb) bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_v4l2_buffer *vb)
{ {
void *vaddr = vb2_plane_vaddr(vb, 0); void *vaddr = vb2_plane_vaddr(&vb->vb2_buf, 0);
u16 soi = be16_to_cpup((__be16 *)vaddr); u16 soi = be16_to_cpup((__be16 *)vaddr);
u16 eoi = be16_to_cpup((__be16 *)(vaddr + u16 eoi = be16_to_cpup((__be16 *)(vaddr +
vb2_get_plane_payload(vb, 0) - 2)); vb2_get_plane_payload(&vb->vb2_buf, 0) - 2));
return soi == SOI_MARKER && eoi == EOI_MARKER; return soi == SOI_MARKER && eoi == EOI_MARKER;
} }

6
drivers/media/platform/coda/coda.h
View File

@ -243,7 +243,7 @@ extern int coda_debug;
void coda_write(struct coda_dev *dev, u32 data, u32 reg); void coda_write(struct coda_dev *dev, u32 data, u32 reg);
unsigned int coda_read(struct coda_dev *dev, u32 reg); unsigned int coda_read(struct coda_dev *dev, u32 reg);
void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data, void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data,
struct vb2_buffer *buf, unsigned int reg_y); struct vb2_v4l2_buffer *buf, unsigned int reg_y);
int coda_alloc_aux_buf(struct coda_dev *dev, struct coda_aux_buf *buf, int coda_alloc_aux_buf(struct coda_dev *dev, struct coda_aux_buf *buf,
size_t size, const char *name, struct dentry *parent); size_t size, const char *name, struct dentry *parent);
@ -284,12 +284,12 @@ static inline unsigned int coda_get_bitstream_payload(struct coda_ctx *ctx)
void coda_bit_stream_end_flag(struct coda_ctx *ctx); void coda_bit_stream_end_flag(struct coda_ctx *ctx);
void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_buffer *buf, void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
enum vb2_buffer_state state); enum vb2_buffer_state state);
int coda_h264_padding(int size, char *p); int coda_h264_padding(int size, char *p);
bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_buffer *vb); bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_v4l2_buffer *vb);
int coda_jpeg_write_tables(struct coda_ctx *ctx); int coda_jpeg_write_tables(struct coda_ctx *ctx);
void coda_set_jpeg_compression_quality(struct coda_ctx *ctx, int quality); void coda_set_jpeg_compression_quality(struct coda_ctx *ctx, int quality);

16
drivers/media/platform/coda/trace.h
View File

@ -49,7 +49,7 @@ TRACE_EVENT(coda_bit_done,
); );
DECLARE_EVENT_CLASS(coda_buf_class, DECLARE_EVENT_CLASS(coda_buf_class,
TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf), TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf),
TP_ARGS(ctx, buf), TP_ARGS(ctx, buf),
@ -61,7 +61,7 @@ DECLARE_EVENT_CLASS(coda_buf_class,
TP_fast_assign( TP_fast_assign(
__entry->minor = ctx->fh.vdev->minor; __entry->minor = ctx->fh.vdev->minor;
__entry->index = buf->v4l2_buf.index; __entry->index = buf->vb2_buf.index;
__entry->ctx = ctx->idx; __entry->ctx = ctx->idx;
), ),
@ -70,17 +70,17 @@ DECLARE_EVENT_CLASS(coda_buf_class,
); );
DEFINE_EVENT(coda_buf_class, coda_enc_pic_run, DEFINE_EVENT(coda_buf_class, coda_enc_pic_run,
TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf), TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf),
TP_ARGS(ctx, buf) TP_ARGS(ctx, buf)
); );
DEFINE_EVENT(coda_buf_class, coda_enc_pic_done, DEFINE_EVENT(coda_buf_class, coda_enc_pic_done,
TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf), TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf),
TP_ARGS(ctx, buf) TP_ARGS(ctx, buf)
); );
DECLARE_EVENT_CLASS(coda_buf_meta_class, DECLARE_EVENT_CLASS(coda_buf_meta_class,
TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf, TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
struct coda_buffer_meta *meta), struct coda_buffer_meta *meta),
TP_ARGS(ctx, buf, meta), TP_ARGS(ctx, buf, meta),
@ -95,7 +95,7 @@ DECLARE_EVENT_CLASS(coda_buf_meta_class,
TP_fast_assign( TP_fast_assign(
__entry->minor = ctx->fh.vdev->minor; __entry->minor = ctx->fh.vdev->minor;
__entry->index = buf->v4l2_buf.index; __entry->index = buf->vb2_buf.index;
__entry->start = meta->start; __entry->start = meta->start;
__entry->end = meta->end; __entry->end = meta->end;
__entry->ctx = ctx->idx; __entry->ctx = ctx->idx;
@ -107,7 +107,7 @@ DECLARE_EVENT_CLASS(coda_buf_meta_class,
); );
DEFINE_EVENT(coda_buf_meta_class, coda_bit_queue, DEFINE_EVENT(coda_buf_meta_class, coda_bit_queue,
TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf, TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
struct coda_buffer_meta *meta), struct coda_buffer_meta *meta),
TP_ARGS(ctx, buf, meta) TP_ARGS(ctx, buf, meta)
); );
@ -146,7 +146,7 @@ DEFINE_EVENT(coda_meta_class, coda_dec_pic_done,
); );
DEFINE_EVENT(coda_buf_meta_class, coda_dec_rot_done, DEFINE_EVENT(coda_buf_meta_class, coda_dec_rot_done,
TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf, TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
struct coda_buffer_meta *meta), struct coda_buffer_meta *meta),
TP_ARGS(ctx, buf, meta) TP_ARGS(ctx, buf, meta)
); );

31
drivers/media/platform/davinci/vpbe_display.c
View File

@ -74,8 +74,8 @@ static void vpbe_isr_even_field(struct vpbe_display *disp_obj,
if (layer->cur_frm == layer->next_frm) if (layer->cur_frm == layer->next_frm)
return; return;
v4l2_get_timestamp(&layer->cur_frm->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&layer->cur_frm->vb.timestamp);
vb2_buffer_done(&layer->cur_frm->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&layer->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
/* Make cur_frm pointing to next_frm */ /* Make cur_frm pointing to next_frm */
layer->cur_frm = layer->next_frm; layer->cur_frm = layer->next_frm;
} }
@ -104,8 +104,8 @@ static void vpbe_isr_odd_field(struct vpbe_display *disp_obj,
list_del(&layer->next_frm->list); list_del(&layer->next_frm->list);
spin_unlock(&disp_obj->dma_queue_lock); spin_unlock(&disp_obj->dma_queue_lock);
/* Mark state of the frame to active */ /* Mark state of the frame to active */
layer->next_frm->vb.state = VB2_BUF_STATE_ACTIVE; layer->next_frm->vb.vb2_buf.state = VB2_BUF_STATE_ACTIVE;
addr = vb2_dma_contig_plane_dma_addr(&layer->next_frm->vb, 0); addr = vb2_dma_contig_plane_dma_addr(&layer->next_frm->vb.vb2_buf, 0);
osd_device->ops.start_layer(osd_device, osd_device->ops.start_layer(osd_device,
layer->layer_info.id, layer->layer_info.id,
addr, addr,
@ -259,8 +259,9 @@ vpbe_buffer_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
*/ */
static void vpbe_buffer_queue(struct vb2_buffer *vb) static void vpbe_buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
/* Get the file handle object and layer object */ /* Get the file handle object and layer object */
struct vpbe_disp_buffer *buf = container_of(vb, struct vpbe_disp_buffer *buf = container_of(vbuf,
struct vpbe_disp_buffer, vb); struct vpbe_disp_buffer, vb);
struct vpbe_layer *layer = vb2_get_drv_priv(vb->vb2_queue); struct vpbe_layer *layer = vb2_get_drv_priv(vb->vb2_queue);
struct vpbe_display *disp = layer->disp_dev; struct vpbe_display *disp = layer->disp_dev;
@ -290,7 +291,7 @@ static int vpbe_start_streaming(struct vb2_queue *vq, unsigned int count)
/* Remove buffer from the buffer queue */ /* Remove buffer from the buffer queue */
list_del(&layer->cur_frm->list); list_del(&layer->cur_frm->list);
/* Mark state of the current frame to active */ /* Mark state of the current frame to active */
layer->cur_frm->vb.state = VB2_BUF_STATE_ACTIVE; layer->cur_frm->vb.vb2_buf.state = VB2_BUF_STATE_ACTIVE;
/* Initialize field_id and started member */ /* Initialize field_id and started member */
layer->field_id = 0; layer->field_id = 0;
@ -299,10 +300,12 @@ static int vpbe_start_streaming(struct vb2_queue *vq, unsigned int count)
if (ret < 0) { if (ret < 0) {
struct vpbe_disp_buffer *buf, *tmp; struct vpbe_disp_buffer *buf, *tmp;
vb2_buffer_done(&layer->cur_frm->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&layer->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_QUEUED);
list_for_each_entry_safe(buf, tmp, &layer->dma_queue, list) { list_for_each_entry_safe(buf, tmp, &layer->dma_queue, list) {
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf,
VB2_BUF_STATE_QUEUED);
} }
return ret; return ret;
@ -332,13 +335,14 @@ static void vpbe_stop_streaming(struct vb2_queue *vq)
/* release all active buffers */ /* release all active buffers */
spin_lock_irqsave(&disp->dma_queue_lock, flags); spin_lock_irqsave(&disp->dma_queue_lock, flags);
if (layer->cur_frm == layer->next_frm) { if (layer->cur_frm == layer->next_frm) {
vb2_buffer_done(&layer->cur_frm->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&layer->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
} else { } else {
if (layer->cur_frm != NULL) if (layer->cur_frm != NULL)
vb2_buffer_done(&layer->cur_frm->vb, vb2_buffer_done(&layer->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR); VB2_BUF_STATE_ERROR);
if (layer->next_frm != NULL) if (layer->next_frm != NULL)
vb2_buffer_done(&layer->next_frm->vb, vb2_buffer_done(&layer->next_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR); VB2_BUF_STATE_ERROR);
} }
@ -346,7 +350,8 @@ static void vpbe_stop_streaming(struct vb2_queue *vq)
layer->next_frm = list_entry(layer->dma_queue.next, layer->next_frm = list_entry(layer->dma_queue.next,
struct vpbe_disp_buffer, list); struct vpbe_disp_buffer, list);
list_del(&layer->next_frm->list); list_del(&layer->next_frm->list);
vb2_buffer_done(&layer->next_frm->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&layer->next_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&disp->dma_queue_lock, flags); spin_unlock_irqrestore(&disp->dma_queue_lock, flags);
} }
@ -383,7 +388,7 @@ static int vpbe_set_osd_display_params(struct vpbe_display *disp_dev,
unsigned long addr; unsigned long addr;
int ret; int ret;
addr = vb2_dma_contig_plane_dma_addr(&layer->cur_frm->vb, 0); addr = vb2_dma_contig_plane_dma_addr(&layer->cur_frm->vb.vb2_buf, 0);
/* Set address in the display registers */ /* Set address in the display registers */
osd_device->ops.start_layer(osd_device, osd_device->ops.start_layer(osd_device,
layer->layer_info.id, layer->layer_info.id,

30
drivers/media/platform/davinci/vpif_capture.c
View File

@ -57,7 +57,8 @@ static u8 channel_first_int[VPIF_NUMBER_OF_OBJECTS][2] = { {1, 1} };
/* Is set to 1 in case of SDTV formats, 2 in case of HDTV formats. */ /* Is set to 1 in case of SDTV formats, 2 in case of HDTV formats. */
static int ycmux_mode; static int ycmux_mode;
static inline struct vpif_cap_buffer *to_vpif_buffer(struct vb2_buffer *vb) static inline
struct vpif_cap_buffer *to_vpif_buffer(struct vb2_v4l2_buffer *vb)
{ {
return container_of(vb, struct vpif_cap_buffer, vb); return container_of(vb, struct vpif_cap_buffer, vb);
} }
@ -72,6 +73,7 @@ static inline struct vpif_cap_buffer *to_vpif_buffer(struct vb2_buffer *vb)
*/ */
static int vpif_buffer_prepare(struct vb2_buffer *vb) static int vpif_buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vb2_queue *q = vb->vb2_queue; struct vb2_queue *q = vb->vb2_queue;
struct channel_obj *ch = vb2_get_drv_priv(q); struct channel_obj *ch = vb2_get_drv_priv(q);
struct common_obj *common; struct common_obj *common;
@ -85,7 +87,7 @@ static int vpif_buffer_prepare(struct vb2_buffer *vb)
if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0)) if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
return -EINVAL; return -EINVAL;
vb->v4l2_buf.field = common->fmt.fmt.pix.field; vbuf->field = common->fmt.fmt.pix.field;
addr = vb2_dma_contig_plane_dma_addr(vb, 0); addr = vb2_dma_contig_plane_dma_addr(vb, 0);
if (!IS_ALIGNED((addr + common->ytop_off), 8) || if (!IS_ALIGNED((addr + common->ytop_off), 8) ||
@ -145,8 +147,9 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
*/ */
static void vpif_buffer_queue(struct vb2_buffer *vb) static void vpif_buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct channel_obj *ch = vb2_get_drv_priv(vb->vb2_queue); struct channel_obj *ch = vb2_get_drv_priv(vb->vb2_queue);
struct vpif_cap_buffer *buf = to_vpif_buffer(vb); struct vpif_cap_buffer *buf = to_vpif_buffer(vbuf);
struct common_obj *common; struct common_obj *common;
unsigned long flags; unsigned long flags;
@ -214,7 +217,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
list_del(&common->cur_frm->list); list_del(&common->cur_frm->list);
spin_unlock_irqrestore(&common->irqlock, flags); spin_unlock_irqrestore(&common->irqlock, flags);
addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb, 0); addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb.vb2_buf, 0);
common->set_addr(addr + common->ytop_off, common->set_addr(addr + common->ytop_off,
addr + common->ybtm_off, addr + common->ybtm_off,
@ -243,7 +246,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
err: err:
list_for_each_entry_safe(buf, tmp, &common->dma_queue, list) { list_for_each_entry_safe(buf, tmp, &common->dma_queue, list) {
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
} }
spin_unlock_irqrestore(&common->irqlock, flags); spin_unlock_irqrestore(&common->irqlock, flags);
@ -286,13 +289,14 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
/* release all active buffers */ /* release all active buffers */
spin_lock_irqsave(&common->irqlock, flags); spin_lock_irqsave(&common->irqlock, flags);
if (common->cur_frm == common->next_frm) { if (common->cur_frm == common->next_frm) {
vb2_buffer_done(&common->cur_frm->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
} else { } else {
if (common->cur_frm != NULL) if (common->cur_frm != NULL)
vb2_buffer_done(&common->cur_frm->vb, vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR); VB2_BUF_STATE_ERROR);
if (common->next_frm != NULL) if (common->next_frm != NULL)
vb2_buffer_done(&common->next_frm->vb, vb2_buffer_done(&common->next_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR); VB2_BUF_STATE_ERROR);
} }
@ -300,7 +304,8 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
common->next_frm = list_entry(common->dma_queue.next, common->next_frm = list_entry(common->dma_queue.next,
struct vpif_cap_buffer, list); struct vpif_cap_buffer, list);
list_del(&common->next_frm->list); list_del(&common->next_frm->list);
vb2_buffer_done(&common->next_frm->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&common->next_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&common->irqlock, flags); spin_unlock_irqrestore(&common->irqlock, flags);
} }
@ -325,9 +330,8 @@ static struct vb2_ops video_qops = {
*/ */
static void vpif_process_buffer_complete(struct common_obj *common) static void vpif_process_buffer_complete(struct common_obj *common)
{ {
v4l2_get_timestamp(&common->cur_frm->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&common->cur_frm->vb.timestamp);
vb2_buffer_done(&common->cur_frm->vb, vb2_buffer_done(&common->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
VB2_BUF_STATE_DONE);
/* Make curFrm pointing to nextFrm */ /* Make curFrm pointing to nextFrm */
common->cur_frm = common->next_frm; common->cur_frm = common->next_frm;
} }
@ -350,7 +354,7 @@ static void vpif_schedule_next_buffer(struct common_obj *common)
/* Remove that buffer from the buffer queue */ /* Remove that buffer from the buffer queue */
list_del(&common->next_frm->list); list_del(&common->next_frm->list);
spin_unlock(&common->irqlock); spin_unlock(&common->irqlock);
addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb, 0); addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb.vb2_buf, 0);
/* Set top and bottom field addresses in VPIF registers */ /* Set top and bottom field addresses in VPIF registers */
common->set_addr(addr + common->ytop_off, common->set_addr(addr + common->ytop_off,

2
drivers/media/platform/davinci/vpif_capture.h
View File

@ -52,7 +52,7 @@ struct video_obj {
}; };
struct vpif_cap_buffer { struct vpif_cap_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };

39
drivers/media/platform/davinci/vpif_display.c
View File

@ -53,7 +53,8 @@ static struct device *vpif_dev;
static void vpif_calculate_offsets(struct channel_obj *ch); static void vpif_calculate_offsets(struct channel_obj *ch);
static void vpif_config_addr(struct channel_obj *ch, int muxmode); static void vpif_config_addr(struct channel_obj *ch, int muxmode);
static inline struct vpif_disp_buffer *to_vpif_buffer(struct vb2_buffer *vb) static inline
struct vpif_disp_buffer *to_vpif_buffer(struct vb2_v4l2_buffer *vb)
{ {
return container_of(vb, struct vpif_disp_buffer, vb); return container_of(vb, struct vpif_disp_buffer, vb);
} }
@ -68,6 +69,7 @@ static inline struct vpif_disp_buffer *to_vpif_buffer(struct vb2_buffer *vb)
*/ */
static int vpif_buffer_prepare(struct vb2_buffer *vb) static int vpif_buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct channel_obj *ch = vb2_get_drv_priv(vb->vb2_queue); struct channel_obj *ch = vb2_get_drv_priv(vb->vb2_queue);
struct common_obj *common; struct common_obj *common;
@ -77,7 +79,7 @@ static int vpif_buffer_prepare(struct vb2_buffer *vb)
if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0)) if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
return -EINVAL; return -EINVAL;
vb->v4l2_buf.field = common->fmt.fmt.pix.field; vbuf->field = common->fmt.fmt.pix.field;
if (vb->vb2_queue->type != V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) { if (vb->vb2_queue->type != V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) {
unsigned long addr = vb2_dma_contig_plane_dma_addr(vb, 0); unsigned long addr = vb2_dma_contig_plane_dma_addr(vb, 0);
@ -138,7 +140,8 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
*/ */
static void vpif_buffer_queue(struct vb2_buffer *vb) static void vpif_buffer_queue(struct vb2_buffer *vb)
{ {
struct vpif_disp_buffer *buf = to_vpif_buffer(vb); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vpif_disp_buffer *buf = to_vpif_buffer(vbuf);
struct channel_obj *ch = vb2_get_drv_priv(vb->vb2_queue); struct channel_obj *ch = vb2_get_drv_priv(vb->vb2_queue);
struct common_obj *common; struct common_obj *common;
unsigned long flags; unsigned long flags;
@ -197,7 +200,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
list_del(&common->cur_frm->list); list_del(&common->cur_frm->list);
spin_unlock_irqrestore(&common->irqlock, flags); spin_unlock_irqrestore(&common->irqlock, flags);
addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb, 0); addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb.vb2_buf, 0);
common->set_addr((addr + common->ytop_off), common->set_addr((addr + common->ytop_off),
(addr + common->ybtm_off), (addr + common->ybtm_off),
(addr + common->ctop_off), (addr + common->ctop_off),
@ -229,7 +232,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
err: err:
list_for_each_entry_safe(buf, tmp, &common->dma_queue, list) { list_for_each_entry_safe(buf, tmp, &common->dma_queue, list) {
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
} }
spin_unlock_irqrestore(&common->irqlock, flags); spin_unlock_irqrestore(&common->irqlock, flags);
@ -264,13 +267,14 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
/* release all active buffers */ /* release all active buffers */
spin_lock_irqsave(&common->irqlock, flags); spin_lock_irqsave(&common->irqlock, flags);
if (common->cur_frm == common->next_frm) { if (common->cur_frm == common->next_frm) {
vb2_buffer_done(&common->cur_frm->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
} else { } else {
if (common->cur_frm != NULL) if (common->cur_frm != NULL)
vb2_buffer_done(&common->cur_frm->vb, vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR); VB2_BUF_STATE_ERROR);
if (common->next_frm != NULL) if (common->next_frm != NULL)
vb2_buffer_done(&common->next_frm->vb, vb2_buffer_done(&common->next_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR); VB2_BUF_STATE_ERROR);
} }
@ -278,7 +282,8 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
common->next_frm = list_entry(common->dma_queue.next, common->next_frm = list_entry(common->dma_queue.next,
struct vpif_disp_buffer, list); struct vpif_disp_buffer, list);
list_del(&common->next_frm->list); list_del(&common->next_frm->list);
vb2_buffer_done(&common->next_frm->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&common->next_frm->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&common->irqlock, flags); spin_unlock_irqrestore(&common->irqlock, flags);
} }
@ -306,7 +311,7 @@ static void process_progressive_mode(struct common_obj *common)
spin_unlock(&common->irqlock); spin_unlock(&common->irqlock);
/* Set top and bottom field addrs in VPIF registers */ /* Set top and bottom field addrs in VPIF registers */
addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb, 0); addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb.vb2_buf, 0);
common->set_addr(addr + common->ytop_off, common->set_addr(addr + common->ytop_off,
addr + common->ybtm_off, addr + common->ybtm_off,
addr + common->ctop_off, addr + common->ctop_off,
@ -324,10 +329,10 @@ static void process_interlaced_mode(int fid, struct common_obj *common)
/* one frame is displayed If next frame is /* one frame is displayed If next frame is
* available, release cur_frm and move on */ * available, release cur_frm and move on */
/* Copy frame display time */ /* Copy frame display time */
v4l2_get_timestamp(&common->cur_frm->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&common->cur_frm->vb.timestamp);
/* Change status of the cur_frm */ /* Change status of the cur_frm */
vb2_buffer_done(&common->cur_frm->vb, vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_DONE); VB2_BUF_STATE_DONE);
/* Make cur_frm pointing to next_frm */ /* Make cur_frm pointing to next_frm */
common->cur_frm = common->next_frm; common->cur_frm = common->next_frm;
@ -380,10 +385,10 @@ static irqreturn_t vpif_channel_isr(int irq, void *dev_id)
if (!channel_first_int[i][channel_id]) { if (!channel_first_int[i][channel_id]) {
/* Mark status of the cur_frm to /* Mark status of the cur_frm to
* done and unlock semaphore on it */ * done and unlock semaphore on it */
v4l2_get_timestamp(&common->cur_frm->vb. v4l2_get_timestamp(
v4l2_buf.timestamp); &common->cur_frm->vb.timestamp);
vb2_buffer_done(&common->cur_frm->vb, vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
VB2_BUF_STATE_DONE); VB2_BUF_STATE_DONE);
/* Make cur_frm pointing to next_frm */ /* Make cur_frm pointing to next_frm */
common->cur_frm = common->next_frm; common->cur_frm = common->next_frm;
} }

2
drivers/media/platform/davinci/vpif_display.h
View File

@ -62,7 +62,7 @@ struct video_obj {
}; };
struct vpif_disp_buffer { struct vpif_disp_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };

2
drivers/media/platform/exynos-gsc/gsc-core.h
View File

@ -136,7 +136,7 @@ struct gsc_fmt {
* @idx : index of G-Scaler input buffer * @idx : index of G-Scaler input buffer
*/ */
struct gsc_input_buf { struct gsc_input_buf {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
int idx; int idx;
}; };

23
drivers/media/platform/exynos-gsc/gsc-m2m.c
View File

@ -77,7 +77,7 @@ static void gsc_m2m_stop_streaming(struct vb2_queue *q)
void gsc_m2m_job_finish(struct gsc_ctx *ctx, int vb_state) void gsc_m2m_job_finish(struct gsc_ctx *ctx, int vb_state)
{ {
struct vb2_buffer *src_vb, *dst_vb; struct vb2_v4l2_buffer *src_vb, *dst_vb;
if (!ctx || !ctx->m2m_ctx) if (!ctx || !ctx->m2m_ctx)
return; return;
@ -86,11 +86,11 @@ void gsc_m2m_job_finish(struct gsc_ctx *ctx, int vb_state)
dst_vb = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx); dst_vb = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
if (src_vb && dst_vb) { if (src_vb && dst_vb) {
dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp; dst_vb->timestamp = src_vb->timestamp;
dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode; dst_vb->timecode = src_vb->timecode;
dst_vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; dst_vb->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_vb->v4l2_buf.flags |= dst_vb->flags |=
src_vb->v4l2_buf.flags src_vb->flags
& V4L2_BUF_FLAG_TSTAMP_SRC_MASK; & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
v4l2_m2m_buf_done(src_vb, vb_state); v4l2_m2m_buf_done(src_vb, vb_state);
@ -109,23 +109,23 @@ static void gsc_m2m_job_abort(void *priv)
static int gsc_get_bufs(struct gsc_ctx *ctx) static int gsc_get_bufs(struct gsc_ctx *ctx)
{ {
struct gsc_frame *s_frame, *d_frame; struct gsc_frame *s_frame, *d_frame;
struct vb2_buffer *src_vb, *dst_vb; struct vb2_v4l2_buffer *src_vb, *dst_vb;
int ret; int ret;
s_frame = &ctx->s_frame; s_frame = &ctx->s_frame;
d_frame = &ctx->d_frame; d_frame = &ctx->d_frame;
src_vb = v4l2_m2m_next_src_buf(ctx->m2m_ctx); src_vb = v4l2_m2m_next_src_buf(ctx->m2m_ctx);
ret = gsc_prepare_addr(ctx, src_vb, s_frame, &s_frame->addr); ret = gsc_prepare_addr(ctx, &src_vb->vb2_buf, s_frame, &s_frame->addr);
if (ret) if (ret)
return ret; return ret;
dst_vb = v4l2_m2m_next_dst_buf(ctx->m2m_ctx); dst_vb = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);
ret = gsc_prepare_addr(ctx, dst_vb, d_frame, &d_frame->addr); ret = gsc_prepare_addr(ctx, &dst_vb->vb2_buf, d_frame, &d_frame->addr);
if (ret) if (ret)
return ret; return ret;
dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp; dst_vb->timestamp = src_vb->timestamp;
return 0; return 0;
} }
@ -255,12 +255,13 @@ static int gsc_m2m_buf_prepare(struct vb2_buffer *vb)
static void gsc_m2m_buf_queue(struct vb2_buffer *vb) static void gsc_m2m_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct gsc_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct gsc_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
pr_debug("ctx: %p, ctx->state: 0x%x", ctx, ctx->state); pr_debug("ctx: %p, ctx->state: 0x%x", ctx, ctx->state);
if (ctx->m2m_ctx) if (ctx->m2m_ctx)
v4l2_m2m_buf_queue(ctx->m2m_ctx, vb); v4l2_m2m_buf_queue(ctx->m2m_ctx, vbuf);
} }
static struct vb2_ops gsc_m2m_qops = { static struct vb2_ops gsc_m2m_qops = {

22
drivers/media/platform/exynos4-is/fimc-capture.c
View File

@ -103,7 +103,7 @@ static int fimc_capture_state_cleanup(struct fimc_dev *fimc, bool suspend)
/* Release unused buffers */ /* Release unused buffers */
while (!suspend && !list_empty(&cap->pending_buf_q)) { while (!suspend && !list_empty(&cap->pending_buf_q)) {
buf = fimc_pending_queue_pop(cap); buf = fimc_pending_queue_pop(cap);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
/* If suspending put unused buffers onto pending queue */ /* If suspending put unused buffers onto pending queue */
while (!list_empty(&cap->active_buf_q)) { while (!list_empty(&cap->active_buf_q)) {
@ -111,7 +111,7 @@ static int fimc_capture_state_cleanup(struct fimc_dev *fimc, bool suspend)
if (suspend) if (suspend)
fimc_pending_queue_add(cap, buf); fimc_pending_queue_add(cap, buf);
else else
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
fimc_hw_reset(fimc); fimc_hw_reset(fimc);
@ -193,10 +193,10 @@ void fimc_capture_irq_handler(struct fimc_dev *fimc, int deq_buf)
test_bit(ST_CAPT_RUN, &fimc->state) && deq_buf) { test_bit(ST_CAPT_RUN, &fimc->state) && deq_buf) {
v_buf = fimc_active_queue_pop(cap); v_buf = fimc_active_queue_pop(cap);
v4l2_get_timestamp(&v_buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&v_buf->vb.timestamp);
v_buf->vb.v4l2_buf.sequence = cap->frame_count++; v_buf->vb.sequence = cap->frame_count++;
vb2_buffer_done(&v_buf->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&v_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
} }
if (!list_empty(&cap->pending_buf_q)) { if (!list_empty(&cap->pending_buf_q)) {
@ -227,7 +227,7 @@ void fimc_capture_irq_handler(struct fimc_dev *fimc, int deq_buf)
list_for_each_entry(v_buf, &cap->active_buf_q, list) { list_for_each_entry(v_buf, &cap->active_buf_q, list) {
if (v_buf->index != index) if (v_buf->index != index)
continue; continue;
vaddr = vb2_plane_vaddr(&v_buf->vb, plane); vaddr = vb2_plane_vaddr(&v_buf->vb.vb2_buf, plane);
v4l2_subdev_call(csis, video, s_rx_buffer, v4l2_subdev_call(csis, video, s_rx_buffer,
vaddr, &size); vaddr, &size);
break; break;
@ -332,7 +332,7 @@ int fimc_capture_resume(struct fimc_dev *fimc)
if (list_empty(&vid_cap->pending_buf_q)) if (list_empty(&vid_cap->pending_buf_q))
break; break;
buf = fimc_pending_queue_pop(vid_cap); buf = fimc_pending_queue_pop(vid_cap);
buffer_queue(&buf->vb); buffer_queue(&buf->vb.vb2_buf);
} }
return 0; return 0;
@ -404,8 +404,9 @@ static int buffer_prepare(struct vb2_buffer *vb)
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct fimc_vid_buffer *buf struct fimc_vid_buffer *buf
= container_of(vb, struct fimc_vid_buffer, vb); = container_of(vbuf, struct fimc_vid_buffer, vb);
struct fimc_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct fimc_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
struct fimc_dev *fimc = ctx->fimc_dev; struct fimc_dev *fimc = ctx->fimc_dev;
struct fimc_vid_cap *vid_cap = &fimc->vid_cap; struct fimc_vid_cap *vid_cap = &fimc->vid_cap;
@ -414,7 +415,7 @@ static void buffer_queue(struct vb2_buffer *vb)
int min_bufs; int min_bufs;
spin_lock_irqsave(&fimc->slock, flags); spin_lock_irqsave(&fimc->slock, flags);
fimc_prepare_addr(ctx, &buf->vb, &ctx->d_frame, &buf->paddr); fimc_prepare_addr(ctx, &buf->vb.vb2_buf, &ctx->d_frame, &buf->paddr);
if (!test_bit(ST_CAPT_SUSPENDED, &fimc->state) && if (!test_bit(ST_CAPT_SUSPENDED, &fimc->state) &&
!test_bit(ST_CAPT_STREAM, &fimc->state) && !test_bit(ST_CAPT_STREAM, &fimc->state) &&
@ -1466,7 +1467,8 @@ void fimc_sensor_notify(struct v4l2_subdev *sd, unsigned int notification,
if (!list_empty(&fimc->vid_cap.active_buf_q)) { if (!list_empty(&fimc->vid_cap.active_buf_q)) {
buf = list_entry(fimc->vid_cap.active_buf_q.next, buf = list_entry(fimc->vid_cap.active_buf_q.next,
struct fimc_vid_buffer, list); struct fimc_vid_buffer, list);
vb2_set_plane_payload(&buf->vb, 0, *((u32 *)arg)); vb2_set_plane_payload(&buf->vb.vb2_buf, 0,
*((u32 *)arg));
} }
fimc_capture_irq_handler(fimc, 1); fimc_capture_irq_handler(fimc, 1);
fimc_deactivate_capture(fimc); fimc_deactivate_capture(fimc);

2
drivers/media/platform/exynos4-is/fimc-core.h
View File

@ -224,7 +224,7 @@ struct fimc_addr {
* @index: buffer index for the output DMA engine * @index: buffer index for the output DMA engine
*/ */
struct fimc_vid_buffer { struct fimc_vid_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
struct fimc_addr paddr; struct fimc_addr paddr;
int index; int index;

13
drivers/media/platform/exynos4-is/fimc-isp-video.c
View File

@ -194,10 +194,11 @@ static int isp_video_capture_buffer_prepare(struct vb2_buffer *vb)
static void isp_video_capture_buffer_queue(struct vb2_buffer *vb) static void isp_video_capture_buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct fimc_isp *isp = vb2_get_drv_priv(vb->vb2_queue); struct fimc_isp *isp = vb2_get_drv_priv(vb->vb2_queue);
struct fimc_is_video *video = &isp->video_capture; struct fimc_is_video *video = &isp->video_capture;
struct fimc_is *is = fimc_isp_to_is(isp); struct fimc_is *is = fimc_isp_to_is(isp);
struct isp_video_buf *ivb = to_isp_video_buf(vb); struct isp_video_buf *ivb = to_isp_video_buf(vbuf);
unsigned long flags; unsigned long flags;
unsigned int i; unsigned int i;
@ -220,7 +221,7 @@ static void isp_video_capture_buffer_queue(struct vb2_buffer *vb)
isp_dbg(2, &video->ve.vdev, isp_dbg(2, &video->ve.vdev,
"dma_buf %pad (%d/%d/%d) addr: %pad\n", "dma_buf %pad (%d/%d/%d) addr: %pad\n",
&buf_index, ivb->index, i, vb->v4l2_buf.index, &buf_index, ivb->index, i, vb->index,
&ivb->dma_addr[i]); &ivb->dma_addr[i]);
} }
@ -242,7 +243,7 @@ static void isp_video_capture_buffer_queue(struct vb2_buffer *vb)
void fimc_isp_video_irq_handler(struct fimc_is *is) void fimc_isp_video_irq_handler(struct fimc_is *is)
{ {
struct fimc_is_video *video = &is->isp.video_capture; struct fimc_is_video *video = &is->isp.video_capture;
struct vb2_buffer *vb; struct vb2_v4l2_buffer *vbuf;
int buf_index; int buf_index;
/* TODO: Ensure the DMA is really stopped in stop_streaming callback */ /* TODO: Ensure the DMA is really stopped in stop_streaming callback */
@ -250,10 +251,10 @@ void fimc_isp_video_irq_handler(struct fimc_is *is)
return; return;
buf_index = (is->i2h_cmd.args[1] - 1) % video->buf_count; buf_index = (is->i2h_cmd.args[1] - 1) % video->buf_count;
vb = &video->buffers[buf_index]->vb; vbuf = &video->buffers[buf_index]->vb;
v4l2_get_timestamp(&vb->v4l2_buf.timestamp); v4l2_get_timestamp(&vbuf->timestamp);
vb2_buffer_done(vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_DONE);
video->buf_mask &= ~BIT(buf_index); video->buf_mask &= ~BIT(buf_index);
fimc_is_hw_set_isp_buf_mask(is, video->buf_mask); fimc_is_hw_set_isp_buf_mask(is, video->buf_mask);

2
drivers/media/platform/exynos4-is/fimc-isp.h
View File

@ -102,7 +102,7 @@ struct fimc_isp_ctrls {
}; };
struct isp_video_buf { struct isp_video_buf {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
dma_addr_t dma_addr[FIMC_ISP_MAX_PLANES]; dma_addr_t dma_addr[FIMC_ISP_MAX_PLANES];
unsigned int index; unsigned int index;
}; };

15
drivers/media/platform/exynos4-is/fimc-lite.c
View File

@ -200,7 +200,7 @@ static int fimc_lite_reinit(struct fimc_lite *fimc, bool suspend)
/* Release unused buffers */ /* Release unused buffers */
while (!suspend && !list_empty(&fimc->pending_buf_q)) { while (!suspend && !list_empty(&fimc->pending_buf_q)) {
buf = fimc_lite_pending_queue_pop(fimc); buf = fimc_lite_pending_queue_pop(fimc);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
/* If suspending put unused buffers onto pending queue */ /* If suspending put unused buffers onto pending queue */
while (!list_empty(&fimc->active_buf_q)) { while (!list_empty(&fimc->active_buf_q)) {
@ -208,7 +208,7 @@ static int fimc_lite_reinit(struct fimc_lite *fimc, bool suspend)
if (suspend) if (suspend)
fimc_lite_pending_queue_add(fimc, buf); fimc_lite_pending_queue_add(fimc, buf);
else else
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&fimc->slock, flags); spin_unlock_irqrestore(&fimc->slock, flags);
@ -292,10 +292,10 @@ static irqreturn_t flite_irq_handler(int irq, void *priv)
test_bit(ST_FLITE_RUN, &fimc->state) && test_bit(ST_FLITE_RUN, &fimc->state) &&
!list_empty(&fimc->active_buf_q)) { !list_empty(&fimc->active_buf_q)) {
vbuf = fimc_lite_active_queue_pop(fimc); vbuf = fimc_lite_active_queue_pop(fimc);
v4l2_get_timestamp(&vbuf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&vbuf->vb.timestamp);
vbuf->vb.v4l2_buf.sequence = fimc->frame_count++; vbuf->vb.sequence = fimc->frame_count++;
flite_hw_mask_dma_buffer(fimc, vbuf->index); flite_hw_mask_dma_buffer(fimc, vbuf->index);
vb2_buffer_done(&vbuf->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&vbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
} }
if (test_bit(ST_FLITE_CONFIG, &fimc->state)) if (test_bit(ST_FLITE_CONFIG, &fimc->state))
@ -417,8 +417,9 @@ static int buffer_prepare(struct vb2_buffer *vb)
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct flite_buffer *buf struct flite_buffer *buf
= container_of(vb, struct flite_buffer, vb); = container_of(vbuf, struct flite_buffer, vb);
struct fimc_lite *fimc = vb2_get_drv_priv(vb->vb2_queue); struct fimc_lite *fimc = vb2_get_drv_priv(vb->vb2_queue);
unsigned long flags; unsigned long flags;
@ -1632,7 +1633,7 @@ static int fimc_lite_resume(struct device *dev)
if (list_empty(&fimc->pending_buf_q)) if (list_empty(&fimc->pending_buf_q))
break; break;
buf = fimc_lite_pending_queue_pop(fimc); buf = fimc_lite_pending_queue_pop(fimc);
buffer_queue(&buf->vb); buffer_queue(&buf->vb.vb2_buf);
} }
return 0; return 0;
} }

2
drivers/media/platform/exynos4-is/fimc-lite.h
View File

@ -100,7 +100,7 @@ struct flite_frame {
* @index: DMA start address register's index * @index: DMA start address register's index
*/ */
struct flite_buffer { struct flite_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
dma_addr_t paddr; dma_addr_t paddr;
unsigned short index; unsigned short index;

19
drivers/media/platform/exynos4-is/fimc-m2m.c
View File

@ -42,7 +42,7 @@ static unsigned int get_m2m_fmt_flags(unsigned int stream_type)
void fimc_m2m_job_finish(struct fimc_ctx *ctx, int vb_state) void fimc_m2m_job_finish(struct fimc_ctx *ctx, int vb_state)
{ {
struct vb2_buffer *src_vb, *dst_vb; struct vb2_v4l2_buffer *src_vb, *dst_vb;
if (!ctx || !ctx->fh.m2m_ctx) if (!ctx || !ctx->fh.m2m_ctx)
return; return;
@ -99,7 +99,7 @@ static void stop_streaming(struct vb2_queue *q)
static void fimc_device_run(void *priv) static void fimc_device_run(void *priv)
{ {
struct vb2_buffer *src_vb, *dst_vb; struct vb2_v4l2_buffer *src_vb, *dst_vb;
struct fimc_ctx *ctx = priv; struct fimc_ctx *ctx = priv;
struct fimc_frame *sf, *df; struct fimc_frame *sf, *df;
struct fimc_dev *fimc; struct fimc_dev *fimc;
@ -123,19 +123,19 @@ static void fimc_device_run(void *priv)
} }
src_vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx); src_vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
ret = fimc_prepare_addr(ctx, src_vb, sf, &sf->paddr); ret = fimc_prepare_addr(ctx, &src_vb->vb2_buf, sf, &sf->paddr);
if (ret) if (ret)
goto dma_unlock; goto dma_unlock;
dst_vb = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); dst_vb = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
ret = fimc_prepare_addr(ctx, dst_vb, df, &df->paddr); ret = fimc_prepare_addr(ctx, &dst_vb->vb2_buf, df, &df->paddr);
if (ret) if (ret)
goto dma_unlock; goto dma_unlock;
dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp; dst_vb->timestamp = src_vb->timestamp;
dst_vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; dst_vb->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_vb->v4l2_buf.flags |= dst_vb->flags |=
src_vb->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; src_vb->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
/* Reconfigure hardware if the context has changed. */ /* Reconfigure hardware if the context has changed. */
if (fimc->m2m.ctx != ctx) { if (fimc->m2m.ctx != ctx) {
@ -220,8 +220,9 @@ static int fimc_buf_prepare(struct vb2_buffer *vb)
static void fimc_buf_queue(struct vb2_buffer *vb) static void fimc_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct fimc_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct fimc_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb); v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
} }
static struct vb2_ops fimc_qops = { static struct vb2_ops fimc_qops = {

23
drivers/media/platform/m2m-deinterlace.c
View File

@ -200,18 +200,18 @@ static void dma_callback(void *data)
{ {
struct deinterlace_ctx *curr_ctx = data; struct deinterlace_ctx *curr_ctx = data;
struct deinterlace_dev *pcdev = curr_ctx->dev; struct deinterlace_dev *pcdev = curr_ctx->dev;
struct vb2_buffer *src_vb, *dst_vb; struct vb2_v4l2_buffer *src_vb, *dst_vb;
atomic_set(&pcdev->busy, 0); atomic_set(&pcdev->busy, 0);
src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx); src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx);
dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx); dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx);
dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp; dst_vb->timestamp = src_vb->timestamp;
dst_vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; dst_vb->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_vb->v4l2_buf.flags |= dst_vb->flags |=
src_vb->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; src_vb->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode; dst_vb->timecode = src_vb->timecode;
v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);
v4l2_m2m_buf_done(dst_vb, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(dst_vb, VB2_BUF_STATE_DONE);
@ -225,7 +225,7 @@ static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op,
int do_callback) int do_callback)
{ {
struct deinterlace_q_data *s_q_data; struct deinterlace_q_data *s_q_data;
struct vb2_buffer *src_buf, *dst_buf; struct vb2_v4l2_buffer *src_buf, *dst_buf;
struct deinterlace_dev *pcdev = ctx->dev; struct deinterlace_dev *pcdev = ctx->dev;
struct dma_chan *chan = pcdev->dma_chan; struct dma_chan *chan = pcdev->dma_chan;
struct dma_device *dmadev = chan->device; struct dma_device *dmadev = chan->device;
@ -243,8 +243,9 @@ static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op,
s_height = s_q_data->height; s_height = s_q_data->height;
s_size = s_width * s_height; s_size = s_width * s_height;
p_in = (dma_addr_t)vb2_dma_contig_plane_dma_addr(src_buf, 0); p_in = (dma_addr_t)vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
p_out = (dma_addr_t)vb2_dma_contig_plane_dma_addr(dst_buf, 0); p_out = (dma_addr_t)vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf,
0);
if (!p_in || !p_out) { if (!p_in || !p_out) {
v4l2_err(&pcdev->v4l2_dev, v4l2_err(&pcdev->v4l2_dev,
"Acquiring kernel pointers to buffers failed\n"); "Acquiring kernel pointers to buffers failed\n");
@ -849,8 +850,10 @@ static int deinterlace_buf_prepare(struct vb2_buffer *vb)
static void deinterlace_buf_queue(struct vb2_buffer *vb) static void deinterlace_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct deinterlace_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct deinterlace_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
v4l2_m2m_buf_queue(ctx->m2m_ctx, vb);
v4l2_m2m_buf_queue(ctx->m2m_ctx, vbuf);
} }
static struct vb2_ops deinterlace_qops = { static struct vb2_ops deinterlace_qops = {

43
drivers/media/platform/marvell-ccic/mcam-core.c
View File

@ -201,18 +201,18 @@ struct mcam_dma_desc {
/* /*
* Our buffer type for working with videobuf2. Note that the vb2 * Our buffer type for working with videobuf2. Note that the vb2
* developers have decreed that struct vb2_buffer must be at the * developers have decreed that struct vb2_v4l2_buffer must be at the
* beginning of this structure. * beginning of this structure.
*/ */
struct mcam_vb_buffer { struct mcam_vb_buffer {
struct vb2_buffer vb_buf; struct vb2_v4l2_buffer vb_buf;
struct list_head queue; struct list_head queue;
struct mcam_dma_desc *dma_desc; /* Descriptor virtual address */ struct mcam_dma_desc *dma_desc; /* Descriptor virtual address */
dma_addr_t dma_desc_pa; /* Descriptor physical address */ dma_addr_t dma_desc_pa; /* Descriptor physical address */
int dma_desc_nent; /* Number of mapped descriptors */ int dma_desc_nent; /* Number of mapped descriptors */
}; };
static inline struct mcam_vb_buffer *vb_to_mvb(struct vb2_buffer *vb) static inline struct mcam_vb_buffer *vb_to_mvb(struct vb2_v4l2_buffer *vb)
{ {
return container_of(vb, struct mcam_vb_buffer, vb_buf); return container_of(vb, struct mcam_vb_buffer, vb_buf);
} }
@ -221,14 +221,14 @@ static inline struct mcam_vb_buffer *vb_to_mvb(struct vb2_buffer *vb)
* Hand a completed buffer back to user space. * Hand a completed buffer back to user space.
*/ */
static void mcam_buffer_done(struct mcam_camera *cam, int frame, static void mcam_buffer_done(struct mcam_camera *cam, int frame,
struct vb2_buffer *vbuf) struct vb2_v4l2_buffer *vbuf)
{ {
vbuf->v4l2_buf.bytesused = cam->pix_format.sizeimage; vbuf->vb2_buf.planes[0].bytesused = cam->pix_format.sizeimage;
vbuf->v4l2_buf.sequence = cam->buf_seq[frame]; vbuf->sequence = cam->buf_seq[frame];
vbuf->v4l2_buf.field = V4L2_FIELD_NONE; vbuf->field = V4L2_FIELD_NONE;
v4l2_get_timestamp(&vbuf->v4l2_buf.timestamp); v4l2_get_timestamp(&vbuf->timestamp);
vb2_set_plane_payload(vbuf, 0, cam->pix_format.sizeimage); vb2_set_plane_payload(&vbuf->vb2_buf, 0, cam->pix_format.sizeimage);
vb2_buffer_done(vbuf, VB2_BUF_STATE_DONE); vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_DONE);
} }
@ -482,7 +482,8 @@ static void mcam_frame_tasklet(unsigned long data)
* Drop the lock during the big copy. This *should* be safe... * Drop the lock during the big copy. This *should* be safe...
*/ */
spin_unlock_irqrestore(&cam->dev_lock, flags); spin_unlock_irqrestore(&cam->dev_lock, flags);
memcpy(vb2_plane_vaddr(&buf->vb_buf, 0), cam->dma_bufs[bufno], memcpy(vb2_plane_vaddr(&buf->vb_buf.vb2_buf, 0),
cam->dma_bufs[bufno],
cam->pix_format.sizeimage); cam->pix_format.sizeimage);
mcam_buffer_done(cam, bufno, &buf->vb_buf); mcam_buffer_done(cam, bufno, &buf->vb_buf);
spin_lock_irqsave(&cam->dev_lock, flags); spin_lock_irqsave(&cam->dev_lock, flags);
@ -548,7 +549,7 @@ static void mcam_set_contig_buffer(struct mcam_camera *cam, int frame)
{ {
struct mcam_vb_buffer *buf; struct mcam_vb_buffer *buf;
dma_addr_t dma_handle; dma_addr_t dma_handle;
struct vb2_buffer *vb; struct vb2_v4l2_buffer *vb;
/* /*
* If there are no available buffers, go into single mode * If there are no available buffers, go into single mode
@ -570,7 +571,7 @@ static void mcam_set_contig_buffer(struct mcam_camera *cam, int frame)
cam->vb_bufs[frame] = buf; cam->vb_bufs[frame] = buf;
vb = &buf->vb_buf; vb = &buf->vb_buf;
dma_handle = vb2_dma_contig_plane_dma_addr(vb, 0); dma_handle = vb2_dma_contig_plane_dma_addr(&vb->vb2_buf, 0);
mcam_write_yuv_bases(cam, frame, dma_handle); mcam_write_yuv_bases(cam, frame, dma_handle);
} }
@ -1071,7 +1072,8 @@ static int mcam_vb_queue_setup(struct vb2_queue *vq,
static void mcam_vb_buf_queue(struct vb2_buffer *vb) static void mcam_vb_buf_queue(struct vb2_buffer *vb)
{ {
struct mcam_vb_buffer *mvb = vb_to_mvb(vb); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct mcam_vb_buffer *mvb = vb_to_mvb(vbuf);
struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue); struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
unsigned long flags; unsigned long flags;
int start; int start;
@ -1096,14 +1098,14 @@ static void mcam_vb_requeue_bufs(struct vb2_queue *vq,
spin_lock_irqsave(&cam->dev_lock, flags); spin_lock_irqsave(&cam->dev_lock, flags);
list_for_each_entry_safe(buf, node, &cam->buffers, queue) { list_for_each_entry_safe(buf, node, &cam->buffers, queue) {
vb2_buffer_done(&buf->vb_buf, state); vb2_buffer_done(&buf->vb_buf.vb2_buf, state);
list_del(&buf->queue); list_del(&buf->queue);
} }
for (i = 0; i < MAX_DMA_BUFS; i++) { for (i = 0; i < MAX_DMA_BUFS; i++) {
buf = cam->vb_bufs[i]; buf = cam->vb_bufs[i];
if (buf) { if (buf) {
vb2_buffer_done(&buf->vb_buf, state); vb2_buffer_done(&buf->vb_buf.vb2_buf, state);
cam->vb_bufs[i] = NULL; cam->vb_bufs[i] = NULL;
} }
} }
@ -1198,7 +1200,8 @@ static const struct vb2_ops mcam_vb2_ops = {
*/ */
static int mcam_vb_sg_buf_init(struct vb2_buffer *vb) static int mcam_vb_sg_buf_init(struct vb2_buffer *vb)
{ {
struct mcam_vb_buffer *mvb = vb_to_mvb(vb); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct mcam_vb_buffer *mvb = vb_to_mvb(vbuf);
struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue); struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
int ndesc = cam->pix_format.sizeimage/PAGE_SIZE + 1; int ndesc = cam->pix_format.sizeimage/PAGE_SIZE + 1;
@ -1214,7 +1217,8 @@ static int mcam_vb_sg_buf_init(struct vb2_buffer *vb)
static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb) static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
{ {
struct mcam_vb_buffer *mvb = vb_to_mvb(vb); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct mcam_vb_buffer *mvb = vb_to_mvb(vbuf);
struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0);
struct mcam_dma_desc *desc = mvb->dma_desc; struct mcam_dma_desc *desc = mvb->dma_desc;
struct scatterlist *sg; struct scatterlist *sg;
@ -1230,8 +1234,9 @@ static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb) static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue); struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
struct mcam_vb_buffer *mvb = vb_to_mvb(vb); struct mcam_vb_buffer *mvb = vb_to_mvb(vbuf);
int ndesc = cam->pix_format.sizeimage/PAGE_SIZE + 1; int ndesc = cam->pix_format.sizeimage/PAGE_SIZE + 1;
dma_free_coherent(cam->dev, ndesc * sizeof(struct mcam_dma_desc), dma_free_coherent(cam->dev, ndesc * sizeof(struct mcam_dma_desc),

15
drivers/media/platform/mx2_emmaprp.c
View File

@ -351,7 +351,7 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data)
{ {
struct emmaprp_dev *pcdev = data; struct emmaprp_dev *pcdev = data;
struct emmaprp_ctx *curr_ctx; struct emmaprp_ctx *curr_ctx;
struct vb2_buffer *src_vb, *dst_vb; struct vb2_v4l2_buffer *src_vb, *dst_vb;
unsigned long flags; unsigned long flags;
u32 irqst; u32 irqst;
@ -375,13 +375,13 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data)
src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx); src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx);
dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx); dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx);
dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp; dst_vb->timestamp = src_vb->timestamp;
dst_vb->v4l2_buf.flags &= dst_vb->flags &=
~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_vb->v4l2_buf.flags |= dst_vb->flags |=
src_vb->v4l2_buf.flags src_vb->flags
& V4L2_BUF_FLAG_TSTAMP_SRC_MASK; & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode; dst_vb->timecode = src_vb->timecode;
spin_lock_irqsave(&pcdev->irqlock, flags); spin_lock_irqsave(&pcdev->irqlock, flags);
v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);
@ -742,8 +742,9 @@ static int emmaprp_buf_prepare(struct vb2_buffer *vb)
static void emmaprp_buf_queue(struct vb2_buffer *vb) static void emmaprp_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct emmaprp_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct emmaprp_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
v4l2_m2m_buf_queue(ctx->m2m_ctx, vb); v4l2_m2m_buf_queue(ctx->m2m_ctx, vbuf);
} }
static struct vb2_ops emmaprp_qops = { static struct vb2_ops emmaprp_qops = {

25
drivers/media/platform/omap3isp/ispvideo.c
View File

@ -342,8 +342,9 @@ static int isp_video_queue_setup(struct vb2_queue *queue,
static int isp_video_buffer_prepare(struct vb2_buffer *buf) static int isp_video_buffer_prepare(struct vb2_buffer *buf)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(buf);
struct isp_video_fh *vfh = vb2_get_drv_priv(buf->vb2_queue); struct isp_video_fh *vfh = vb2_get_drv_priv(buf->vb2_queue);
struct isp_buffer *buffer = to_isp_buffer(buf); struct isp_buffer *buffer = to_isp_buffer(vbuf);
struct isp_video *video = vfh->video; struct isp_video *video = vfh->video;
dma_addr_t addr; dma_addr_t addr;
@ -363,7 +364,8 @@ static int isp_video_buffer_prepare(struct vb2_buffer *buf)
return -EINVAL; return -EINVAL;
} }
vb2_set_plane_payload(&buffer->vb, 0, vfh->format.fmt.pix.sizeimage); vb2_set_plane_payload(&buffer->vb.vb2_buf, 0,
vfh->format.fmt.pix.sizeimage);
buffer->dma = addr; buffer->dma = addr;
return 0; return 0;
@ -380,8 +382,9 @@ static int isp_video_buffer_prepare(struct vb2_buffer *buf)
*/ */
static void isp_video_buffer_queue(struct vb2_buffer *buf) static void isp_video_buffer_queue(struct vb2_buffer *buf)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(buf);
struct isp_video_fh *vfh = vb2_get_drv_priv(buf->vb2_queue); struct isp_video_fh *vfh = vb2_get_drv_priv(buf->vb2_queue);
struct isp_buffer *buffer = to_isp_buffer(buf); struct isp_buffer *buffer = to_isp_buffer(vbuf);
struct isp_video *video = vfh->video; struct isp_video *video = vfh->video;
struct isp_pipeline *pipe = to_isp_pipeline(&video->video.entity); struct isp_pipeline *pipe = to_isp_pipeline(&video->video.entity);
enum isp_pipeline_state state; enum isp_pipeline_state state;
@ -392,7 +395,7 @@ static void isp_video_buffer_queue(struct vb2_buffer *buf)
spin_lock_irqsave(&video->irqlock, flags); spin_lock_irqsave(&video->irqlock, flags);
if (unlikely(video->error)) { if (unlikely(video->error)) {
vb2_buffer_done(&buffer->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buffer->vb.vb2_buf, VB2_BUF_STATE_ERROR);
spin_unlock_irqrestore(&video->irqlock, flags); spin_unlock_irqrestore(&video->irqlock, flags);
return; return;
} }
@ -464,7 +467,7 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)
list_del(&buf->irqlist); list_del(&buf->irqlist);
spin_unlock_irqrestore(&video->irqlock, flags); spin_unlock_irqrestore(&video->irqlock, flags);
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.timestamp);
/* Do frame number propagation only if this is the output video node. /* Do frame number propagation only if this is the output video node.
* Frame number either comes from the CSI receivers or it gets * Frame number either comes from the CSI receivers or it gets
@ -473,15 +476,15 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)
* first, so the input number might lag behind by 1 in some cases. * first, so the input number might lag behind by 1 in some cases.
*/ */
if (video == pipe->output && !pipe->do_propagation) if (video == pipe->output && !pipe->do_propagation)
buf->vb.v4l2_buf.sequence = buf->vb.sequence =
atomic_inc_return(&pipe->frame_number); atomic_inc_return(&pipe->frame_number);
else else
buf->vb.v4l2_buf.sequence = atomic_read(&pipe->frame_number); buf->vb.sequence = atomic_read(&pipe->frame_number);
if (pipe->field != V4L2_FIELD_NONE) if (pipe->field != V4L2_FIELD_NONE)
buf->vb.v4l2_buf.sequence /= 2; buf->vb.sequence /= 2;
buf->vb.v4l2_buf.field = pipe->field; buf->vb.field = pipe->field;
/* Report pipeline errors to userspace on the capture device side. */ /* Report pipeline errors to userspace on the capture device side. */
if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && pipe->error) { if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && pipe->error) {
@ -491,7 +494,7 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)
state = VB2_BUF_STATE_DONE; state = VB2_BUF_STATE_DONE;
} }
vb2_buffer_done(&buf->vb, state); vb2_buffer_done(&buf->vb.vb2_buf, state);
spin_lock_irqsave(&video->irqlock, flags); spin_lock_irqsave(&video->irqlock, flags);
@ -546,7 +549,7 @@ void omap3isp_video_cancel_stream(struct isp_video *video)
buf = list_first_entry(&video->dmaqueue, buf = list_first_entry(&video->dmaqueue,
struct isp_buffer, irqlist); struct isp_buffer, irqlist);
list_del(&buf->irqlist); list_del(&buf->irqlist);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
video->error = true; video->error = true;

2
drivers/media/platform/omap3isp/ispvideo.h
View File

@ -122,7 +122,7 @@ static inline int isp_pipeline_ready(struct isp_pipeline *pipe)
* @dma: DMA address * @dma: DMA address
*/ */
struct isp_buffer { struct isp_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head irqlist; struct list_head irqlist;
dma_addr_t dma; dma_addr_t dma;
}; };

59
drivers/media/platform/rcar_jpu.c
View File

@ -471,7 +471,7 @@ static const char *error_to_text[16] = {
"Unknown" "Unknown"
}; };
static struct jpu_buffer *vb2_to_jpu_buffer(struct vb2_buffer *vb) static struct jpu_buffer *vb2_to_jpu_buffer(struct vb2_v4l2_buffer *vb)
{ {
struct v4l2_m2m_buffer *b = struct v4l2_m2m_buffer *b =
container_of(vb, struct v4l2_m2m_buffer, vb); container_of(vb, struct v4l2_m2m_buffer, vb);
@ -1044,6 +1044,7 @@ static int jpu_queue_setup(struct vb2_queue *vq,
static int jpu_buf_prepare(struct vb2_buffer *vb) static int jpu_buf_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct jpu_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct jpu_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
struct jpu_q_data *q_data; struct jpu_q_data *q_data;
unsigned int i; unsigned int i;
@ -1051,9 +1052,9 @@ static int jpu_buf_prepare(struct vb2_buffer *vb)
q_data = jpu_get_q_data(ctx, vb->vb2_queue->type); q_data = jpu_get_q_data(ctx, vb->vb2_queue->type);
if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) { if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
if (vb->v4l2_buf.field == V4L2_FIELD_ANY) if (vbuf->field == V4L2_FIELD_ANY)
vb->v4l2_buf.field = V4L2_FIELD_NONE; vbuf->field = V4L2_FIELD_NONE;
if (vb->v4l2_buf.field != V4L2_FIELD_NONE) { if (vbuf->field != V4L2_FIELD_NONE) {
dev_err(ctx->jpu->dev, "%s field isn't supported\n", dev_err(ctx->jpu->dev, "%s field isn't supported\n",
__func__); __func__);
return -EINVAL; return -EINVAL;
@ -1080,10 +1081,11 @@ static int jpu_buf_prepare(struct vb2_buffer *vb)
static void jpu_buf_queue(struct vb2_buffer *vb) static void jpu_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct jpu_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct jpu_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
if (!ctx->encoder && V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) { if (!ctx->encoder && V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
struct jpu_buffer *jpu_buf = vb2_to_jpu_buffer(vb); struct jpu_buffer *jpu_buf = vb2_to_jpu_buffer(vbuf);
struct jpu_q_data *q_data, adjust; struct jpu_q_data *q_data, adjust;
void *buffer = vb2_plane_vaddr(vb, 0); void *buffer = vb2_plane_vaddr(vb, 0);
unsigned long buf_size = vb2_get_plane_payload(vb, 0); unsigned long buf_size = vb2_get_plane_payload(vb, 0);
@ -1117,7 +1119,7 @@ static void jpu_buf_queue(struct vb2_buffer *vb)
} }
if (ctx->fh.m2m_ctx) if (ctx->fh.m2m_ctx)
v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb); v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
return; return;
@ -1128,14 +1130,15 @@ format_error:
static void jpu_buf_finish(struct vb2_buffer *vb) static void jpu_buf_finish(struct vb2_buffer *vb)
{ {
struct jpu_buffer *jpu_buf = vb2_to_jpu_buffer(vb); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct jpu_buffer *jpu_buf = vb2_to_jpu_buffer(vbuf);
struct jpu_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct jpu_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
struct jpu_q_data *q_data = &ctx->out_q; struct jpu_q_data *q_data = &ctx->out_q;
enum v4l2_buf_type type = vb->vb2_queue->type; enum v4l2_buf_type type = vb->vb2_queue->type;
u8 *buffer; u8 *buffer;
if (vb->state == VB2_BUF_STATE_DONE) if (vb->state == VB2_BUF_STATE_DONE)
vb->v4l2_buf.sequence = jpu_get_q_data(ctx, type)->sequence++; vbuf->sequence = jpu_get_q_data(ctx, type)->sequence++;
if (!ctx->encoder || vb->state != VB2_BUF_STATE_DONE || if (!ctx->encoder || vb->state != VB2_BUF_STATE_DONE ||
V4L2_TYPE_IS_OUTPUT(type)) V4L2_TYPE_IS_OUTPUT(type))
@ -1163,7 +1166,7 @@ static int jpu_start_streaming(struct vb2_queue *vq, unsigned count)
static void jpu_stop_streaming(struct vb2_queue *vq) static void jpu_stop_streaming(struct vb2_queue *vq)
{ {
struct jpu_ctx *ctx = vb2_get_drv_priv(vq); struct jpu_ctx *ctx = vb2_get_drv_priv(vq);
struct vb2_buffer *vb; struct vb2_v4l2_buffer *vb;
unsigned long flags; unsigned long flags;
for (;;) { for (;;) {
@ -1327,7 +1330,7 @@ static const struct v4l2_file_operations jpu_fops = {
static void jpu_cleanup(struct jpu_ctx *ctx, bool reset) static void jpu_cleanup(struct jpu_ctx *ctx, bool reset)
{ {
/* remove current buffers and finish job */ /* remove current buffers and finish job */
struct vb2_buffer *src_buf, *dst_buf; struct vb2_v4l2_buffer *src_buf, *dst_buf;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ctx->jpu->lock, flags); spin_lock_irqsave(&ctx->jpu->lock, flags);
@ -1353,7 +1356,7 @@ static void jpu_device_run(void *priv)
struct jpu *jpu = ctx->jpu; struct jpu *jpu = ctx->jpu;
struct jpu_buffer *jpu_buf; struct jpu_buffer *jpu_buf;
struct jpu_q_data *q_data; struct jpu_q_data *q_data;
struct vb2_buffer *src_buf, *dst_buf; struct vb2_v4l2_buffer *src_buf, *dst_buf;
unsigned int w, h, bpl; unsigned int w, h, bpl;
unsigned char num_planes, subsampling; unsigned char num_planes, subsampling;
unsigned long flags; unsigned long flags;
@ -1389,10 +1392,12 @@ static void jpu_device_run(void *priv)
unsigned long src_1_addr, src_2_addr, dst_addr; unsigned long src_1_addr, src_2_addr, dst_addr;
unsigned int redu, inft; unsigned int redu, inft;
dst_addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0); dst_addr = vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
src_1_addr = vb2_dma_contig_plane_dma_addr(src_buf, 0); src_1_addr =
vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
if (num_planes > 1) if (num_planes > 1)
src_2_addr = vb2_dma_contig_plane_dma_addr(src_buf, 1); src_2_addr = vb2_dma_contig_plane_dma_addr(
&src_buf->vb2_buf, 1);
else else
src_2_addr = src_1_addr + w * h; src_2_addr = src_1_addr + w * h;
@ -1453,10 +1458,12 @@ static void jpu_device_run(void *priv)
return; return;
} }
src_addr = vb2_dma_contig_plane_dma_addr(src_buf, 0); src_addr = vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
dst_1_addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0); dst_1_addr =
vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
if (q_data->fmtinfo->num_planes > 1) if (q_data->fmtinfo->num_planes > 1)
dst_2_addr = vb2_dma_contig_plane_dma_addr(dst_buf, 1); dst_2_addr = vb2_dma_contig_plane_dma_addr(
&dst_buf->vb2_buf, 1);
else else
dst_2_addr = dst_1_addr + w * h; dst_2_addr = dst_1_addr + w * h;
@ -1511,7 +1518,7 @@ static irqreturn_t jpu_irq_handler(int irq, void *dev_id)
{ {
struct jpu *jpu = dev_id; struct jpu *jpu = dev_id;
struct jpu_ctx *curr_ctx; struct jpu_ctx *curr_ctx;
struct vb2_buffer *src_buf, *dst_buf; struct vb2_v4l2_buffer *src_buf, *dst_buf;
unsigned int int_status; unsigned int int_status;
int_status = jpu_read(jpu, JINTS); int_status = jpu_read(jpu, JINTS);
@ -1547,18 +1554,18 @@ static irqreturn_t jpu_irq_handler(int irq, void *dev_id)
unsigned long payload_size = jpu_read(jpu, JCDTCU) << 16 unsigned long payload_size = jpu_read(jpu, JCDTCU) << 16
| jpu_read(jpu, JCDTCM) << 8 | jpu_read(jpu, JCDTCM) << 8
| jpu_read(jpu, JCDTCD); | jpu_read(jpu, JCDTCD);
vb2_set_plane_payload(dst_buf, 0, vb2_set_plane_payload(&dst_buf->vb2_buf, 0,
payload_size + JPU_JPEG_HDR_SIZE); payload_size + JPU_JPEG_HDR_SIZE);
} }
dst_buf->v4l2_buf.field = src_buf->v4l2_buf.field; dst_buf->field = src_buf->field;
dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp; dst_buf->timestamp = src_buf->timestamp;
if (src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_TIMECODE) if (src_buf->flags & V4L2_BUF_FLAG_TIMECODE)
dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode; dst_buf->timecode = src_buf->timecode;
dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; dst_buf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_buf->v4l2_buf.flags |= src_buf->v4l2_buf.flags & dst_buf->flags |= src_buf->flags &
V4L2_BUF_FLAG_TSTAMP_SRC_MASK; V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_buf->v4l2_buf.flags = src_buf->v4l2_buf.flags & dst_buf->flags = src_buf->flags &
(V4L2_BUF_FLAG_TIMECODE | V4L2_BUF_FLAG_KEYFRAME | (V4L2_BUF_FLAG_TIMECODE | V4L2_BUF_FLAG_KEYFRAME |
V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME | V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME |
V4L2_BUF_FLAG_TSTAMP_SRC_MASK); V4L2_BUF_FLAG_TSTAMP_SRC_MASK);

15
drivers/media/platform/s3c-camif/camif-capture.c
View File

@ -164,12 +164,12 @@ static int camif_reinitialize(struct camif_vp *vp)
/* Release unused buffers */ /* Release unused buffers */
while (!list_empty(&vp->pending_buf_q)) { while (!list_empty(&vp->pending_buf_q)) {
buf = camif_pending_queue_pop(vp); buf = camif_pending_queue_pop(vp);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
while (!list_empty(&vp->active_buf_q)) { while (!list_empty(&vp->active_buf_q)) {
buf = camif_active_queue_pop(vp); buf = camif_active_queue_pop(vp);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&camif->slock, flags); spin_unlock_irqrestore(&camif->slock, flags);
@ -338,9 +338,9 @@ irqreturn_t s3c_camif_irq_handler(int irq, void *priv)
if (!WARN_ON(vbuf == NULL)) { if (!WARN_ON(vbuf == NULL)) {
/* Dequeue a filled buffer */ /* Dequeue a filled buffer */
v4l2_get_timestamp(&vbuf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&vbuf->vb.timestamp);
vbuf->vb.v4l2_buf.sequence = vp->frame_sequence++; vbuf->vb.sequence = vp->frame_sequence++;
vb2_buffer_done(&vbuf->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&vbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
/* Set up an empty buffer at the DMA engine */ /* Set up an empty buffer at the DMA engine */
vbuf = camif_pending_queue_pop(vp); vbuf = camif_pending_queue_pop(vp);
@ -490,13 +490,14 @@ static int buffer_prepare(struct vb2_buffer *vb)
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct camif_buffer *buf = container_of(vb, struct camif_buffer, vb); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct camif_buffer *buf = container_of(vbuf, struct camif_buffer, vb);
struct camif_vp *vp = vb2_get_drv_priv(vb->vb2_queue); struct camif_vp *vp = vb2_get_drv_priv(vb->vb2_queue);
struct camif_dev *camif = vp->camif; struct camif_dev *camif = vp->camif;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&camif->slock, flags); spin_lock_irqsave(&camif->slock, flags);
WARN_ON(camif_prepare_addr(vp, &buf->vb, &buf->paddr)); WARN_ON(camif_prepare_addr(vp, &buf->vb.vb2_buf, &buf->paddr));
if (!(vp->state & ST_VP_STREAMING) && vp->active_buffers < 2) { if (!(vp->state & ST_VP_STREAMING) && vp->active_buffers < 2) {
/* Schedule an empty buffer in H/W */ /* Schedule an empty buffer in H/W */

2
drivers/media/platform/s3c-camif/camif-core.h
View File

@ -322,7 +322,7 @@ struct camif_addr {
* @index: an identifier of this buffer at the DMA engine * @index: an identifier of this buffer at the DMA engine
*/ */
struct camif_buffer { struct camif_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
struct camif_addr paddr; struct camif_addr paddr;
unsigned int index; unsigned int index;

15
drivers/media/platform/s5p-g2d/g2d.c
View File

@ -134,8 +134,9 @@ static int g2d_buf_prepare(struct vb2_buffer *vb)
static void g2d_buf_queue(struct vb2_buffer *vb) static void g2d_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct g2d_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct g2d_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb); v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
} }
static struct vb2_ops g2d_qops = { static struct vb2_ops g2d_qops = {
@ -537,7 +538,7 @@ static irqreturn_t g2d_isr(int irq, void *prv)
{ {
struct g2d_dev *dev = prv; struct g2d_dev *dev = prv;
struct g2d_ctx *ctx = dev->curr; struct g2d_ctx *ctx = dev->curr;
struct vb2_buffer *src, *dst; struct vb2_v4l2_buffer *src, *dst;
g2d_clear_int(dev); g2d_clear_int(dev);
clk_disable(dev->gate); clk_disable(dev->gate);
@ -550,11 +551,11 @@ static irqreturn_t g2d_isr(int irq, void *prv)
BUG_ON(src == NULL); BUG_ON(src == NULL);
BUG_ON(dst == NULL); BUG_ON(dst == NULL);
dst->v4l2_buf.timecode = src->v4l2_buf.timecode; dst->timecode = src->timecode;
dst->v4l2_buf.timestamp = src->v4l2_buf.timestamp; dst->timestamp = src->timestamp;
dst->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; dst->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst->v4l2_buf.flags |= dst->flags |=
src->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; src->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
v4l2_m2m_buf_done(src, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(src, VB2_BUF_STATE_DONE);
v4l2_m2m_buf_done(dst, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(dst, VB2_BUF_STATE_DONE);

30
drivers/media/platform/s5p-jpeg/jpeg-core.c
View File

@ -2483,6 +2483,7 @@ static int s5p_jpeg_buf_prepare(struct vb2_buffer *vb)
static void s5p_jpeg_buf_queue(struct vb2_buffer *vb) static void s5p_jpeg_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
if (ctx->mode == S5P_JPEG_DECODE && if (ctx->mode == S5P_JPEG_DECODE &&
@ -2517,7 +2518,7 @@ static void s5p_jpeg_buf_queue(struct vb2_buffer *vb)
q_data->h = tmp.h; q_data->h = tmp.h;
} }
v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb); v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
} }
static int s5p_jpeg_start_streaming(struct vb2_queue *q, unsigned int count) static int s5p_jpeg_start_streaming(struct vb2_queue *q, unsigned int count)
@ -2588,7 +2589,7 @@ static irqreturn_t s5p_jpeg_irq(int irq, void *dev_id)
{ {
struct s5p_jpeg *jpeg = dev_id; struct s5p_jpeg *jpeg = dev_id;
struct s5p_jpeg_ctx *curr_ctx; struct s5p_jpeg_ctx *curr_ctx;
struct vb2_buffer *src_buf, *dst_buf; struct vb2_v4l2_buffer *src_buf, *dst_buf;
unsigned long payload_size = 0; unsigned long payload_size = 0;
enum vb2_buffer_state state = VB2_BUF_STATE_DONE; enum vb2_buffer_state state = VB2_BUF_STATE_DONE;
bool enc_jpeg_too_large = false; bool enc_jpeg_too_large = false;
@ -2622,15 +2623,15 @@ static irqreturn_t s5p_jpeg_irq(int irq, void *dev_id)
payload_size = s5p_jpeg_compressed_size(jpeg->regs); payload_size = s5p_jpeg_compressed_size(jpeg->regs);
} }
dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode; dst_buf->timecode = src_buf->timecode;
dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp; dst_buf->timestamp = src_buf->timestamp;
dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; dst_buf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_buf->v4l2_buf.flags |= dst_buf->flags |=
src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; src_buf->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
v4l2_m2m_buf_done(src_buf, state); v4l2_m2m_buf_done(src_buf, state);
if (curr_ctx->mode == S5P_JPEG_ENCODE) if (curr_ctx->mode == S5P_JPEG_ENCODE)
vb2_set_plane_payload(dst_buf, 0, payload_size); vb2_set_plane_payload(&dst_buf->vb2_buf, 0, payload_size);
v4l2_m2m_buf_done(dst_buf, state); v4l2_m2m_buf_done(dst_buf, state);
v4l2_m2m_job_finish(jpeg->m2m_dev, curr_ctx->fh.m2m_ctx); v4l2_m2m_job_finish(jpeg->m2m_dev, curr_ctx->fh.m2m_ctx);
@ -2645,7 +2646,7 @@ static irqreturn_t s5p_jpeg_irq(int irq, void *dev_id)
static irqreturn_t exynos4_jpeg_irq(int irq, void *priv) static irqreturn_t exynos4_jpeg_irq(int irq, void *priv)
{ {
unsigned int int_status; unsigned int int_status;
struct vb2_buffer *src_vb, *dst_vb; struct vb2_v4l2_buffer *src_vb, *dst_vb;
struct s5p_jpeg *jpeg = priv; struct s5p_jpeg *jpeg = priv;
struct s5p_jpeg_ctx *curr_ctx; struct s5p_jpeg_ctx *curr_ctx;
unsigned long payload_size = 0; unsigned long payload_size = 0;
@ -2687,7 +2688,8 @@ static irqreturn_t exynos4_jpeg_irq(int irq, void *priv)
if (jpeg->irq_ret == OK_ENC_OR_DEC) { if (jpeg->irq_ret == OK_ENC_OR_DEC) {
if (curr_ctx->mode == S5P_JPEG_ENCODE) { if (curr_ctx->mode == S5P_JPEG_ENCODE) {
payload_size = exynos4_jpeg_get_stream_size(jpeg->regs); payload_size = exynos4_jpeg_get_stream_size(jpeg->regs);
vb2_set_plane_payload(dst_vb, 0, payload_size); vb2_set_plane_payload(&dst_vb->vb2_buf,
0, payload_size);
} }
v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);
v4l2_m2m_buf_done(dst_vb, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(dst_vb, VB2_BUF_STATE_DONE);
@ -2708,7 +2710,7 @@ static irqreturn_t exynos3250_jpeg_irq(int irq, void *dev_id)
{ {
struct s5p_jpeg *jpeg = dev_id; struct s5p_jpeg *jpeg = dev_id;
struct s5p_jpeg_ctx *curr_ctx; struct s5p_jpeg_ctx *curr_ctx;
struct vb2_buffer *src_buf, *dst_buf; struct vb2_v4l2_buffer *src_buf, *dst_buf;
unsigned long payload_size = 0; unsigned long payload_size = 0;
enum vb2_buffer_state state = VB2_BUF_STATE_DONE; enum vb2_buffer_state state = VB2_BUF_STATE_DONE;
bool interrupt_timeout = false; bool interrupt_timeout = false;
@ -2752,12 +2754,12 @@ static irqreturn_t exynos3250_jpeg_irq(int irq, void *dev_id)
src_buf = v4l2_m2m_src_buf_remove(curr_ctx->fh.m2m_ctx); src_buf = v4l2_m2m_src_buf_remove(curr_ctx->fh.m2m_ctx);
dst_buf = v4l2_m2m_dst_buf_remove(curr_ctx->fh.m2m_ctx); dst_buf = v4l2_m2m_dst_buf_remove(curr_ctx->fh.m2m_ctx);
dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode; dst_buf->timecode = src_buf->timecode;
dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp; dst_buf->timestamp = src_buf->timestamp;
v4l2_m2m_buf_done(src_buf, state); v4l2_m2m_buf_done(src_buf, state);
if (curr_ctx->mode == S5P_JPEG_ENCODE) if (curr_ctx->mode == S5P_JPEG_ENCODE)
vb2_set_plane_payload(dst_buf, 0, payload_size); vb2_set_plane_payload(&dst_buf->vb2_buf, 0, payload_size);
v4l2_m2m_buf_done(dst_buf, state); v4l2_m2m_buf_done(dst_buf, state);
v4l2_m2m_job_finish(jpeg->m2m_dev, curr_ctx->fh.m2m_ctx); v4l2_m2m_job_finish(jpeg->m2m_dev, curr_ctx->fh.m2m_ctx);

78
drivers/media/platform/s5p-mfc/s5p_mfc.c
View File

@ -199,22 +199,22 @@ static void s5p_mfc_handle_frame_all_extracted(struct s5p_mfc_ctx *ctx)
dst_buf = list_entry(ctx->dst_queue.next, dst_buf = list_entry(ctx->dst_queue.next,
struct s5p_mfc_buf, list); struct s5p_mfc_buf, list);
mfc_debug(2, "Cleaning up buffer: %d\n", mfc_debug(2, "Cleaning up buffer: %d\n",
dst_buf->b->v4l2_buf.index); dst_buf->b->vb2_buf.index);
vb2_set_plane_payload(dst_buf->b, 0, 0); vb2_set_plane_payload(&dst_buf->b->vb2_buf, 0, 0);
vb2_set_plane_payload(dst_buf->b, 1, 0); vb2_set_plane_payload(&dst_buf->b->vb2_buf, 1, 0);
list_del(&dst_buf->list); list_del(&dst_buf->list);
ctx->dst_queue_cnt--; ctx->dst_queue_cnt--;
dst_buf->b->v4l2_buf.sequence = (ctx->sequence++); dst_buf->b->sequence = (ctx->sequence++);
if (s5p_mfc_hw_call(dev->mfc_ops, get_pic_type_top, ctx) == if (s5p_mfc_hw_call(dev->mfc_ops, get_pic_type_top, ctx) ==
s5p_mfc_hw_call(dev->mfc_ops, get_pic_type_bot, ctx)) s5p_mfc_hw_call(dev->mfc_ops, get_pic_type_bot, ctx))
dst_buf->b->v4l2_buf.field = V4L2_FIELD_NONE; dst_buf->b->field = V4L2_FIELD_NONE;
else else
dst_buf->b->v4l2_buf.field = V4L2_FIELD_INTERLACED; dst_buf->b->field = V4L2_FIELD_INTERLACED;
dst_buf->b->v4l2_buf.flags |= V4L2_BUF_FLAG_LAST; dst_buf->b->flags |= V4L2_BUF_FLAG_LAST;
ctx->dec_dst_flag &= ~(1 << dst_buf->b->v4l2_buf.index); ctx->dec_dst_flag &= ~(1 << dst_buf->b->vb2_buf.index);
vb2_buffer_done(dst_buf->b, VB2_BUF_STATE_DONE); vb2_buffer_done(&dst_buf->b->vb2_buf, VB2_BUF_STATE_DONE);
} }
} }
@ -235,27 +235,28 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx)
appropriate flags. */ appropriate flags. */
src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
list_for_each_entry(dst_buf, &ctx->dst_queue, list) { list_for_each_entry(dst_buf, &ctx->dst_queue, list) {
if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dec_y_addr) { if (vb2_dma_contig_plane_dma_addr(&dst_buf->b->vb2_buf, 0)
dst_buf->b->v4l2_buf.timecode = == dec_y_addr) {
src_buf->b->v4l2_buf.timecode; dst_buf->b->timecode =
dst_buf->b->v4l2_buf.timestamp = src_buf->b->timecode;
src_buf->b->v4l2_buf.timestamp; dst_buf->b->timestamp =
dst_buf->b->v4l2_buf.flags &= src_buf->b->timestamp;
dst_buf->b->flags &=
~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_buf->b->v4l2_buf.flags |= dst_buf->b->flags |=
src_buf->b->v4l2_buf.flags src_buf->b->flags
& V4L2_BUF_FLAG_TSTAMP_SRC_MASK; & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
switch (frame_type) { switch (frame_type) {
case S5P_FIMV_DECODE_FRAME_I_FRAME: case S5P_FIMV_DECODE_FRAME_I_FRAME:
dst_buf->b->v4l2_buf.flags |= dst_buf->b->flags |=
V4L2_BUF_FLAG_KEYFRAME; V4L2_BUF_FLAG_KEYFRAME;
break; break;
case S5P_FIMV_DECODE_FRAME_P_FRAME: case S5P_FIMV_DECODE_FRAME_P_FRAME:
dst_buf->b->v4l2_buf.flags |= dst_buf->b->flags |=
V4L2_BUF_FLAG_PFRAME; V4L2_BUF_FLAG_PFRAME;
break; break;
case S5P_FIMV_DECODE_FRAME_B_FRAME: case S5P_FIMV_DECODE_FRAME_B_FRAME:
dst_buf->b->v4l2_buf.flags |= dst_buf->b->flags |=
V4L2_BUF_FLAG_BFRAME; V4L2_BUF_FLAG_BFRAME;
break; break;
default: default:
@ -296,25 +297,28 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err)
* check which videobuf does it correspond to */ * check which videobuf does it correspond to */
list_for_each_entry(dst_buf, &ctx->dst_queue, list) { list_for_each_entry(dst_buf, &ctx->dst_queue, list) {
/* Check if this is the buffer we're looking for */ /* Check if this is the buffer we're looking for */
if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dspl_y_addr) { if (vb2_dma_contig_plane_dma_addr(&dst_buf->b->vb2_buf, 0)
== dspl_y_addr) {
list_del(&dst_buf->list); list_del(&dst_buf->list);
ctx->dst_queue_cnt--; ctx->dst_queue_cnt--;
dst_buf->b->v4l2_buf.sequence = ctx->sequence; dst_buf->b->sequence = ctx->sequence;
if (s5p_mfc_hw_call(dev->mfc_ops, if (s5p_mfc_hw_call(dev->mfc_ops,
get_pic_type_top, ctx) == get_pic_type_top, ctx) ==
s5p_mfc_hw_call(dev->mfc_ops, s5p_mfc_hw_call(dev->mfc_ops,
get_pic_type_bot, ctx)) get_pic_type_bot, ctx))
dst_buf->b->v4l2_buf.field = V4L2_FIELD_NONE; dst_buf->b->field = V4L2_FIELD_NONE;
else else
dst_buf->b->v4l2_buf.field = dst_buf->b->field =
V4L2_FIELD_INTERLACED; V4L2_FIELD_INTERLACED;
vb2_set_plane_payload(dst_buf->b, 0, ctx->luma_size); vb2_set_plane_payload(&dst_buf->b->vb2_buf, 0,
vb2_set_plane_payload(dst_buf->b, 1, ctx->chroma_size); ctx->luma_size);
clear_bit(dst_buf->b->v4l2_buf.index, vb2_set_plane_payload(&dst_buf->b->vb2_buf, 1,
ctx->chroma_size);
clear_bit(dst_buf->b->vb2_buf.index,
&ctx->dec_dst_flag); &ctx->dec_dst_flag);
vb2_buffer_done(dst_buf->b, vb2_buffer_done(&dst_buf->b->vb2_buf, err ?
err ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
break; break;
} }
@ -395,7 +399,7 @@ static void s5p_mfc_handle_frame(struct s5p_mfc_ctx *ctx,
if (ctx->codec_mode != S5P_MFC_CODEC_H264_DEC && if (ctx->codec_mode != S5P_MFC_CODEC_H264_DEC &&
ctx->codec_mode != S5P_MFC_CODEC_VP8_DEC && ctx->codec_mode != S5P_MFC_CODEC_VP8_DEC &&
ctx->consumed_stream + STUFF_BYTE < ctx->consumed_stream + STUFF_BYTE <
src_buf->b->v4l2_planes[0].bytesused) { src_buf->b->vb2_buf.planes[0].bytesused) {
/* Run MFC again on the same buffer */ /* Run MFC again on the same buffer */
mfc_debug(2, "Running again the same buffer\n"); mfc_debug(2, "Running again the same buffer\n");
ctx->after_packed_pb = 1; ctx->after_packed_pb = 1;
@ -407,9 +411,11 @@ static void s5p_mfc_handle_frame(struct s5p_mfc_ctx *ctx,
list_del(&src_buf->list); list_del(&src_buf->list);
ctx->src_queue_cnt--; ctx->src_queue_cnt--;
if (s5p_mfc_hw_call(dev->mfc_ops, err_dec, err) > 0) if (s5p_mfc_hw_call(dev->mfc_ops, err_dec, err) > 0)
vb2_buffer_done(src_buf->b, VB2_BUF_STATE_ERROR); vb2_buffer_done(&src_buf->b->vb2_buf,
VB2_BUF_STATE_ERROR);
else else
vb2_buffer_done(src_buf->b, VB2_BUF_STATE_DONE); vb2_buffer_done(&src_buf->b->vb2_buf,
VB2_BUF_STATE_DONE);
} }
} }
leave_handle_frame: leave_handle_frame:
@ -510,7 +516,7 @@ static void s5p_mfc_handle_seq_done(struct s5p_mfc_ctx *ctx,
struct s5p_mfc_buf, list); struct s5p_mfc_buf, list);
if (s5p_mfc_hw_call(dev->mfc_ops, get_consumed_stream, if (s5p_mfc_hw_call(dev->mfc_ops, get_consumed_stream,
dev) < dev) <
src_buf->b->v4l2_planes[0].bytesused) src_buf->b->vb2_buf.planes[0].bytesused)
ctx->head_processed = 0; ctx->head_processed = 0;
else else
ctx->head_processed = 1; ctx->head_processed = 1;
@ -551,7 +557,7 @@ static void s5p_mfc_handle_init_buffers(struct s5p_mfc_ctx *ctx,
struct s5p_mfc_buf, list); struct s5p_mfc_buf, list);
list_del(&src_buf->list); list_del(&src_buf->list);
ctx->src_queue_cnt--; ctx->src_queue_cnt--;
vb2_buffer_done(src_buf->b, vb2_buffer_done(&src_buf->b->vb2_buf,
VB2_BUF_STATE_DONE); VB2_BUF_STATE_DONE);
} }
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
@ -592,8 +598,8 @@ static void s5p_mfc_handle_stream_complete(struct s5p_mfc_ctx *ctx,
list); list);
list_del(&mb_entry->list); list_del(&mb_entry->list);
ctx->dst_queue_cnt--; ctx->dst_queue_cnt--;
vb2_set_plane_payload(mb_entry->b, 0, 0); vb2_set_plane_payload(&mb_entry->b->vb2_buf, 0, 0);
vb2_buffer_done(mb_entry->b, VB2_BUF_STATE_DONE); vb2_buffer_done(&mb_entry->b->vb2_buf, VB2_BUF_STATE_DONE);
} }
spin_unlock(&dev->irqlock); spin_unlock(&dev->irqlock);

2
drivers/media/platform/s5p-mfc/s5p_mfc_common.h
View File

@ -179,8 +179,8 @@ struct s5p_mfc_ctx;
* struct s5p_mfc_buf - MFC buffer * struct s5p_mfc_buf - MFC buffer
*/ */
struct s5p_mfc_buf { struct s5p_mfc_buf {
struct vb2_v4l2_buffer *b;
struct list_head list; struct list_head list;
struct vb2_buffer *b;
union { union {
struct { struct {
size_t luma; size_t luma;

15
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
View File

@ -945,6 +945,7 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq,
static int s5p_mfc_buf_init(struct vb2_buffer *vb) static int s5p_mfc_buf_init(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vb2_queue *vq = vb->vb2_queue; struct vb2_queue *vq = vb->vb2_queue;
struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv); struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);
unsigned int i; unsigned int i;
@ -964,8 +965,8 @@ static int s5p_mfc_buf_init(struct vb2_buffer *vb)
mfc_err("Plane buffer (CAPTURE) is too small\n"); mfc_err("Plane buffer (CAPTURE) is too small\n");
return -EINVAL; return -EINVAL;
} }
i = vb->v4l2_buf.index; i = vb->index;
ctx->dst_bufs[i].b = vb; ctx->dst_bufs[i].b = vbuf;
ctx->dst_bufs[i].cookie.raw.luma = ctx->dst_bufs[i].cookie.raw.luma =
vb2_dma_contig_plane_dma_addr(vb, 0); vb2_dma_contig_plane_dma_addr(vb, 0);
ctx->dst_bufs[i].cookie.raw.chroma = ctx->dst_bufs[i].cookie.raw.chroma =
@ -982,8 +983,8 @@ static int s5p_mfc_buf_init(struct vb2_buffer *vb)
return -EINVAL; return -EINVAL;
} }
i = vb->v4l2_buf.index; i = vb->index;
ctx->src_bufs[i].b = vb; ctx->src_bufs[i].b = vbuf;
ctx->src_bufs[i].cookie.stream = ctx->src_bufs[i].cookie.stream =
vb2_dma_contig_plane_dma_addr(vb, 0); vb2_dma_contig_plane_dma_addr(vb, 0);
ctx->src_bufs_cnt++; ctx->src_bufs_cnt++;
@ -1065,18 +1066,18 @@ static void s5p_mfc_buf_queue(struct vb2_buffer *vb)
struct s5p_mfc_buf *mfc_buf; struct s5p_mfc_buf *mfc_buf;
if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
mfc_buf = &ctx->src_bufs[vb->v4l2_buf.index]; mfc_buf = &ctx->src_bufs[vb->index];
mfc_buf->flags &= ~MFC_BUF_FLAG_USED; mfc_buf->flags &= ~MFC_BUF_FLAG_USED;
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
list_add_tail(&mfc_buf->list, &ctx->src_queue); list_add_tail(&mfc_buf->list, &ctx->src_queue);
ctx->src_queue_cnt++; ctx->src_queue_cnt++;
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
} else if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { } else if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
mfc_buf = &ctx->dst_bufs[vb->v4l2_buf.index]; mfc_buf = &ctx->dst_bufs[vb->index];
mfc_buf->flags &= ~MFC_BUF_FLAG_USED; mfc_buf->flags &= ~MFC_BUF_FLAG_USED;
/* Mark destination as available for use by MFC */ /* Mark destination as available for use by MFC */
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
set_bit(vb->v4l2_buf.index, &ctx->dec_dst_flag); set_bit(vb->index, &ctx->dec_dst_flag);
list_add_tail(&mfc_buf->list, &ctx->dst_queue); list_add_tail(&mfc_buf->list, &ctx->dst_queue);
ctx->dst_queue_cnt++; ctx->dst_queue_cnt++;
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);

58
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
View File

@ -773,8 +773,8 @@ static int enc_pre_seq_start(struct s5p_mfc_ctx *ctx)
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list); dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0); dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
dst_size = vb2_plane_size(dst_mb->b, 0); dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
s5p_mfc_hw_call_void(dev->mfc_ops, set_enc_stream_buffer, ctx, dst_addr, s5p_mfc_hw_call_void(dev->mfc_ops, set_enc_stream_buffer, ctx, dst_addr,
dst_size); dst_size);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
@ -796,10 +796,11 @@ static int enc_post_seq_start(struct s5p_mfc_ctx *ctx)
struct s5p_mfc_buf, list); struct s5p_mfc_buf, list);
list_del(&dst_mb->list); list_del(&dst_mb->list);
ctx->dst_queue_cnt--; ctx->dst_queue_cnt--;
vb2_set_plane_payload(dst_mb->b, 0, vb2_set_plane_payload(&dst_mb->b->vb2_buf, 0,
s5p_mfc_hw_call(dev->mfc_ops, get_enc_strm_size, s5p_mfc_hw_call(dev->mfc_ops, get_enc_strm_size,
dev)); dev));
vb2_buffer_done(dst_mb->b, VB2_BUF_STATE_DONE); vb2_buffer_done(&dst_mb->b->vb2_buf,
VB2_BUF_STATE_DONE);
} }
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
} }
@ -831,16 +832,16 @@ static int enc_pre_frame_start(struct s5p_mfc_ctx *ctx)
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
src_mb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); src_mb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
src_y_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, 0); src_y_addr = vb2_dma_contig_plane_dma_addr(&src_mb->b->vb2_buf, 0);
src_c_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, 1); src_c_addr = vb2_dma_contig_plane_dma_addr(&src_mb->b->vb2_buf, 1);
s5p_mfc_hw_call_void(dev->mfc_ops, set_enc_frame_buffer, ctx, s5p_mfc_hw_call_void(dev->mfc_ops, set_enc_frame_buffer, ctx,
src_y_addr, src_c_addr); src_y_addr, src_c_addr);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list); dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0); dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
dst_size = vb2_plane_size(dst_mb->b, 0); dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
s5p_mfc_hw_call_void(dev->mfc_ops, set_enc_stream_buffer, ctx, dst_addr, s5p_mfc_hw_call_void(dev->mfc_ops, set_enc_stream_buffer, ctx, dst_addr,
dst_size); dst_size);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
@ -869,25 +870,29 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
s5p_mfc_hw_call_void(dev->mfc_ops, get_enc_frame_buffer, ctx, s5p_mfc_hw_call_void(dev->mfc_ops, get_enc_frame_buffer, ctx,
&enc_y_addr, &enc_c_addr); &enc_y_addr, &enc_c_addr);
list_for_each_entry(mb_entry, &ctx->src_queue, list) { list_for_each_entry(mb_entry, &ctx->src_queue, list) {
mb_y_addr = vb2_dma_contig_plane_dma_addr(mb_entry->b, 0); mb_y_addr = vb2_dma_contig_plane_dma_addr(
mb_c_addr = vb2_dma_contig_plane_dma_addr(mb_entry->b, 1); &mb_entry->b->vb2_buf, 0);
mb_c_addr = vb2_dma_contig_plane_dma_addr(
&mb_entry->b->vb2_buf, 1);
if ((enc_y_addr == mb_y_addr) && if ((enc_y_addr == mb_y_addr) &&
(enc_c_addr == mb_c_addr)) { (enc_c_addr == mb_c_addr)) {
list_del(&mb_entry->list); list_del(&mb_entry->list);
ctx->src_queue_cnt--; ctx->src_queue_cnt--;
vb2_buffer_done(mb_entry->b, vb2_buffer_done(&mb_entry->b->vb2_buf,
VB2_BUF_STATE_DONE); VB2_BUF_STATE_DONE);
break; break;
} }
} }
list_for_each_entry(mb_entry, &ctx->ref_queue, list) { list_for_each_entry(mb_entry, &ctx->ref_queue, list) {
mb_y_addr = vb2_dma_contig_plane_dma_addr(mb_entry->b, 0); mb_y_addr = vb2_dma_contig_plane_dma_addr(
mb_c_addr = vb2_dma_contig_plane_dma_addr(mb_entry->b, 1); &mb_entry->b->vb2_buf, 0);
mb_c_addr = vb2_dma_contig_plane_dma_addr(
&mb_entry->b->vb2_buf, 1);
if ((enc_y_addr == mb_y_addr) && if ((enc_y_addr == mb_y_addr) &&
(enc_c_addr == mb_c_addr)) { (enc_c_addr == mb_c_addr)) {
list_del(&mb_entry->list); list_del(&mb_entry->list);
ctx->ref_queue_cnt--; ctx->ref_queue_cnt--;
vb2_buffer_done(mb_entry->b, vb2_buffer_done(&mb_entry->b->vb2_buf,
VB2_BUF_STATE_DONE); VB2_BUF_STATE_DONE);
break; break;
} }
@ -912,17 +917,17 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
ctx->dst_queue_cnt--; ctx->dst_queue_cnt--;
switch (slice_type) { switch (slice_type) {
case S5P_FIMV_ENC_SI_SLICE_TYPE_I: case S5P_FIMV_ENC_SI_SLICE_TYPE_I:
mb_entry->b->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME; mb_entry->b->flags |= V4L2_BUF_FLAG_KEYFRAME;
break; break;
case S5P_FIMV_ENC_SI_SLICE_TYPE_P: case S5P_FIMV_ENC_SI_SLICE_TYPE_P:
mb_entry->b->v4l2_buf.flags |= V4L2_BUF_FLAG_PFRAME; mb_entry->b->flags |= V4L2_BUF_FLAG_PFRAME;
break; break;
case S5P_FIMV_ENC_SI_SLICE_TYPE_B: case S5P_FIMV_ENC_SI_SLICE_TYPE_B:
mb_entry->b->v4l2_buf.flags |= V4L2_BUF_FLAG_BFRAME; mb_entry->b->flags |= V4L2_BUF_FLAG_BFRAME;
break; break;
} }
vb2_set_plane_payload(mb_entry->b, 0, strm_size); vb2_set_plane_payload(&mb_entry->b->vb2_buf, 0, strm_size);
vb2_buffer_done(mb_entry->b, VB2_BUF_STATE_DONE); vb2_buffer_done(&mb_entry->b->vb2_buf, VB2_BUF_STATE_DONE);
} }
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
if ((ctx->src_queue_cnt == 0) || (ctx->dst_queue_cnt == 0)) if ((ctx->src_queue_cnt == 0) || (ctx->dst_queue_cnt == 0))
@ -1806,7 +1811,7 @@ static int check_vb_with_fmt(struct s5p_mfc_fmt *fmt, struct vb2_buffer *vb)
return -EINVAL; return -EINVAL;
} }
mfc_debug(2, "index: %d, plane[%d] cookie: %pad\n", mfc_debug(2, "index: %d, plane[%d] cookie: %pad\n",
vb->v4l2_buf.index, i, &dma); vb->index, i, &dma);
} }
return 0; return 0;
} }
@ -1869,6 +1874,7 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq,
static int s5p_mfc_buf_init(struct vb2_buffer *vb) static int s5p_mfc_buf_init(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vb2_queue *vq = vb->vb2_queue; struct vb2_queue *vq = vb->vb2_queue;
struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv); struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);
unsigned int i; unsigned int i;
@ -1878,8 +1884,8 @@ static int s5p_mfc_buf_init(struct vb2_buffer *vb)
ret = check_vb_with_fmt(ctx->dst_fmt, vb); ret = check_vb_with_fmt(ctx->dst_fmt, vb);
if (ret < 0) if (ret < 0)
return ret; return ret;
i = vb->v4l2_buf.index; i = vb->index;
ctx->dst_bufs[i].b = vb; ctx->dst_bufs[i].b = vbuf;
ctx->dst_bufs[i].cookie.stream = ctx->dst_bufs[i].cookie.stream =
vb2_dma_contig_plane_dma_addr(vb, 0); vb2_dma_contig_plane_dma_addr(vb, 0);
ctx->dst_bufs_cnt++; ctx->dst_bufs_cnt++;
@ -1887,8 +1893,8 @@ static int s5p_mfc_buf_init(struct vb2_buffer *vb)
ret = check_vb_with_fmt(ctx->src_fmt, vb); ret = check_vb_with_fmt(ctx->src_fmt, vb);
if (ret < 0) if (ret < 0)
return ret; return ret;
i = vb->v4l2_buf.index; i = vb->index;
ctx->src_bufs[i].b = vb; ctx->src_bufs[i].b = vbuf;
ctx->src_bufs[i].cookie.raw.luma = ctx->src_bufs[i].cookie.raw.luma =
vb2_dma_contig_plane_dma_addr(vb, 0); vb2_dma_contig_plane_dma_addr(vb, 0);
ctx->src_bufs[i].cookie.raw.chroma = ctx->src_bufs[i].cookie.raw.chroma =
@ -2012,7 +2018,7 @@ static void s5p_mfc_buf_queue(struct vb2_buffer *vb)
return; return;
} }
if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
mfc_buf = &ctx->dst_bufs[vb->v4l2_buf.index]; mfc_buf = &ctx->dst_bufs[vb->index];
mfc_buf->flags &= ~MFC_BUF_FLAG_USED; mfc_buf->flags &= ~MFC_BUF_FLAG_USED;
/* Mark destination as available for use by MFC */ /* Mark destination as available for use by MFC */
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
@ -2020,7 +2026,7 @@ static void s5p_mfc_buf_queue(struct vb2_buffer *vb)
ctx->dst_queue_cnt++; ctx->dst_queue_cnt++;
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
} else if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { } else if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
mfc_buf = &ctx->src_bufs[vb->v4l2_buf.index]; mfc_buf = &ctx->src_bufs[vb->index];
mfc_buf->flags &= ~MFC_BUF_FLAG_USED; mfc_buf->flags &= ~MFC_BUF_FLAG_USED;
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
list_add_tail(&mfc_buf->list, &ctx->src_queue); list_add_tail(&mfc_buf->list, &ctx->src_queue);

46
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
View File

@ -1208,11 +1208,11 @@ static int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx, int last_frame)
temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
temp_vb->flags |= MFC_BUF_FLAG_USED; temp_vb->flags |= MFC_BUF_FLAG_USED;
s5p_mfc_set_dec_stream_buffer_v5(ctx, s5p_mfc_set_dec_stream_buffer_v5(ctx,
vb2_dma_contig_plane_dma_addr(temp_vb->b, 0), vb2_dma_contig_plane_dma_addr(&temp_vb->b->vb2_buf, 0),
ctx->consumed_stream, temp_vb->b->v4l2_planes[0].bytesused); ctx->consumed_stream, temp_vb->b->vb2_buf.planes[0].bytesused);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
dev->curr_ctx = ctx->num; dev->curr_ctx = ctx->num;
if (temp_vb->b->v4l2_planes[0].bytesused == 0) { if (temp_vb->b->vb2_buf.planes[0].bytesused == 0) {
last_frame = MFC_DEC_LAST_FRAME; last_frame = MFC_DEC_LAST_FRAME;
mfc_debug(2, "Setting ctx->state to FINISHING\n"); mfc_debug(2, "Setting ctx->state to FINISHING\n");
ctx->state = MFCINST_FINISHING; ctx->state = MFCINST_FINISHING;
@ -1249,16 +1249,16 @@ static int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
src_mb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, src_mb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf,
list); list);
src_mb->flags |= MFC_BUF_FLAG_USED; src_mb->flags |= MFC_BUF_FLAG_USED;
if (src_mb->b->v4l2_planes[0].bytesused == 0) { if (src_mb->b->vb2_buf.planes[0].bytesused == 0) {
/* send null frame */ /* send null frame */
s5p_mfc_set_enc_frame_buffer_v5(ctx, dev->bank2, s5p_mfc_set_enc_frame_buffer_v5(ctx, dev->bank2,
dev->bank2); dev->bank2);
ctx->state = MFCINST_FINISHING; ctx->state = MFCINST_FINISHING;
} else { } else {
src_y_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, src_y_addr = vb2_dma_contig_plane_dma_addr(
0); &src_mb->b->vb2_buf, 0);
src_c_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, src_c_addr = vb2_dma_contig_plane_dma_addr(
1); &src_mb->b->vb2_buf, 1);
s5p_mfc_set_enc_frame_buffer_v5(ctx, src_y_addr, s5p_mfc_set_enc_frame_buffer_v5(ctx, src_y_addr,
src_c_addr); src_c_addr);
if (src_mb->flags & MFC_BUF_FLAG_EOS) if (src_mb->flags & MFC_BUF_FLAG_EOS)
@ -1267,13 +1267,13 @@ static int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
} }
dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list); dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
dst_mb->flags |= MFC_BUF_FLAG_USED; dst_mb->flags |= MFC_BUF_FLAG_USED;
dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0); dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
dst_size = vb2_plane_size(dst_mb->b, 0); dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
s5p_mfc_set_enc_stream_buffer_v5(ctx, dst_addr, dst_size); s5p_mfc_set_enc_stream_buffer_v5(ctx, dst_addr, dst_size);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
dev->curr_ctx = ctx->num; dev->curr_ctx = ctx->num;
mfc_debug(2, "encoding buffer with index=%d state=%d\n", mfc_debug(2, "encoding buffer with index=%d state=%d\n",
src_mb ? src_mb->b->v4l2_buf.index : -1, ctx->state); src_mb ? src_mb->b->vb2_buf.index : -1, ctx->state);
s5p_mfc_encode_one_frame_v5(ctx); s5p_mfc_encode_one_frame_v5(ctx);
return 0; return 0;
} }
@ -1289,10 +1289,11 @@ static void s5p_mfc_run_init_dec(struct s5p_mfc_ctx *ctx)
mfc_debug(2, "Preparing to init decoding\n"); mfc_debug(2, "Preparing to init decoding\n");
temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
s5p_mfc_set_dec_desc_buffer(ctx); s5p_mfc_set_dec_desc_buffer(ctx);
mfc_debug(2, "Header size: %d\n", temp_vb->b->v4l2_planes[0].bytesused); mfc_debug(2, "Header size: %d\n",
temp_vb->b->vb2_buf.planes[0].bytesused);
s5p_mfc_set_dec_stream_buffer_v5(ctx, s5p_mfc_set_dec_stream_buffer_v5(ctx,
vb2_dma_contig_plane_dma_addr(temp_vb->b, 0), vb2_dma_contig_plane_dma_addr(&temp_vb->b->vb2_buf, 0),
0, temp_vb->b->v4l2_planes[0].bytesused); 0, temp_vb->b->vb2_buf.planes[0].bytesused);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
dev->curr_ctx = ctx->num; dev->curr_ctx = ctx->num;
s5p_mfc_init_decode_v5(ctx); s5p_mfc_init_decode_v5(ctx);
@ -1309,8 +1310,8 @@ static void s5p_mfc_run_init_enc(struct s5p_mfc_ctx *ctx)
s5p_mfc_set_enc_ref_buffer_v5(ctx); s5p_mfc_set_enc_ref_buffer_v5(ctx);
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list); dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0); dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
dst_size = vb2_plane_size(dst_mb->b, 0); dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
s5p_mfc_set_enc_stream_buffer_v5(ctx, dst_addr, dst_size); s5p_mfc_set_enc_stream_buffer_v5(ctx, dst_addr, dst_size);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
dev->curr_ctx = ctx->num; dev->curr_ctx = ctx->num;
@ -1342,10 +1343,11 @@ static int s5p_mfc_run_init_dec_buffers(struct s5p_mfc_ctx *ctx)
return -EIO; return -EIO;
} }
temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
mfc_debug(2, "Header size: %d\n", temp_vb->b->v4l2_planes[0].bytesused); mfc_debug(2, "Header size: %d\n",
temp_vb->b->vb2_buf.planes[0].bytesused);
s5p_mfc_set_dec_stream_buffer_v5(ctx, s5p_mfc_set_dec_stream_buffer_v5(ctx,
vb2_dma_contig_plane_dma_addr(temp_vb->b, 0), vb2_dma_contig_plane_dma_addr(&temp_vb->b->vb2_buf, 0),
0, temp_vb->b->v4l2_planes[0].bytesused); 0, temp_vb->b->vb2_buf.planes[0].bytesused);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
dev->curr_ctx = ctx->num; dev->curr_ctx = ctx->num;
ret = s5p_mfc_set_dec_frame_buffer_v5(ctx); ret = s5p_mfc_set_dec_frame_buffer_v5(ctx);
@ -1478,9 +1480,9 @@ static void s5p_mfc_cleanup_queue_v5(struct list_head *lh, struct vb2_queue *vq)
while (!list_empty(lh)) { while (!list_empty(lh)) {
b = list_entry(lh->next, struct s5p_mfc_buf, list); b = list_entry(lh->next, struct s5p_mfc_buf, list);
for (i = 0; i < b->b->num_planes; i++) for (i = 0; i < b->b->vb2_buf.num_planes; i++)
vb2_set_plane_payload(b->b, i, 0); vb2_set_plane_payload(&b->b->vb2_buf, i, 0);
vb2_buffer_done(b->b, VB2_BUF_STATE_ERROR); vb2_buffer_done(&b->b->vb2_buf, VB2_BUF_STATE_ERROR);
list_del(&b->list); list_del(&b->list);
} }
} }

33
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
View File

@ -1562,13 +1562,13 @@ static inline int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx)
temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
temp_vb->flags |= MFC_BUF_FLAG_USED; temp_vb->flags |= MFC_BUF_FLAG_USED;
s5p_mfc_set_dec_stream_buffer_v6(ctx, s5p_mfc_set_dec_stream_buffer_v6(ctx,
vb2_dma_contig_plane_dma_addr(temp_vb->b, 0), vb2_dma_contig_plane_dma_addr(&temp_vb->b->vb2_buf, 0),
ctx->consumed_stream, ctx->consumed_stream,
temp_vb->b->v4l2_planes[0].bytesused); temp_vb->b->vb2_buf.planes[0].bytesused);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
dev->curr_ctx = ctx->num; dev->curr_ctx = ctx->num;
if (temp_vb->b->v4l2_planes[0].bytesused == 0) { if (temp_vb->b->vb2_buf.planes[0].bytesused == 0) {
last_frame = 1; last_frame = 1;
mfc_debug(2, "Setting ctx->state to FINISHING\n"); mfc_debug(2, "Setting ctx->state to FINISHING\n");
ctx->state = MFCINST_FINISHING; ctx->state = MFCINST_FINISHING;
@ -1606,8 +1606,8 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
src_mb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); src_mb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
src_mb->flags |= MFC_BUF_FLAG_USED; src_mb->flags |= MFC_BUF_FLAG_USED;
src_y_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, 0); src_y_addr = vb2_dma_contig_plane_dma_addr(&src_mb->b->vb2_buf, 0);
src_c_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, 1); src_c_addr = vb2_dma_contig_plane_dma_addr(&src_mb->b->vb2_buf, 1);
mfc_debug(2, "enc src y addr: 0x%08lx\n", src_y_addr); mfc_debug(2, "enc src y addr: 0x%08lx\n", src_y_addr);
mfc_debug(2, "enc src c addr: 0x%08lx\n", src_c_addr); mfc_debug(2, "enc src c addr: 0x%08lx\n", src_c_addr);
@ -1616,8 +1616,8 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list); dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
dst_mb->flags |= MFC_BUF_FLAG_USED; dst_mb->flags |= MFC_BUF_FLAG_USED;
dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0); dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
dst_size = vb2_plane_size(dst_mb->b, 0); dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
s5p_mfc_set_enc_stream_buffer_v6(ctx, dst_addr, dst_size); s5p_mfc_set_enc_stream_buffer_v6(ctx, dst_addr, dst_size);
@ -1639,10 +1639,11 @@ static inline void s5p_mfc_run_init_dec(struct s5p_mfc_ctx *ctx)
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
mfc_debug(2, "Preparing to init decoding.\n"); mfc_debug(2, "Preparing to init decoding.\n");
temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
mfc_debug(2, "Header size: %d\n", temp_vb->b->v4l2_planes[0].bytesused); mfc_debug(2, "Header size: %d\n",
temp_vb->b->vb2_buf.planes[0].bytesused);
s5p_mfc_set_dec_stream_buffer_v6(ctx, s5p_mfc_set_dec_stream_buffer_v6(ctx,
vb2_dma_contig_plane_dma_addr(temp_vb->b, 0), 0, vb2_dma_contig_plane_dma_addr(&temp_vb->b->vb2_buf, 0), 0,
temp_vb->b->v4l2_planes[0].bytesused); temp_vb->b->vb2_buf.planes[0].bytesused);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
dev->curr_ctx = ctx->num; dev->curr_ctx = ctx->num;
s5p_mfc_init_decode_v6(ctx); s5p_mfc_init_decode_v6(ctx);
@ -1659,8 +1660,8 @@ static inline void s5p_mfc_run_init_enc(struct s5p_mfc_ctx *ctx)
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);
dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list); dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0); dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
dst_size = vb2_plane_size(dst_mb->b, 0); dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
s5p_mfc_set_enc_stream_buffer_v6(ctx, dst_addr, dst_size); s5p_mfc_set_enc_stream_buffer_v6(ctx, dst_addr, dst_size);
spin_unlock_irqrestore(&dev->irqlock, flags); spin_unlock_irqrestore(&dev->irqlock, flags);
dev->curr_ctx = ctx->num; dev->curr_ctx = ctx->num;
@ -1836,9 +1837,9 @@ static void s5p_mfc_cleanup_queue_v6(struct list_head *lh, struct vb2_queue *vq)
while (!list_empty(lh)) { while (!list_empty(lh)) {
b = list_entry(lh->next, struct s5p_mfc_buf, list); b = list_entry(lh->next, struct s5p_mfc_buf, list);
for (i = 0; i < b->b->num_planes; i++) for (i = 0; i < b->b->vb2_buf.num_planes; i++)
vb2_set_plane_payload(b->b, i, 0); vb2_set_plane_payload(&b->b->vb2_buf, i, 0);
vb2_buffer_done(b->b, VB2_BUF_STATE_ERROR); vb2_buffer_done(&b->b->vb2_buf, VB2_BUF_STATE_ERROR);
list_del(&b->list); list_del(&b->list);
} }
} }

2
drivers/media/platform/s5p-tv/mixer.h
View File

@ -113,7 +113,7 @@ struct mxr_geometry {
/** instance of a buffer */ /** instance of a buffer */
struct mxr_buffer { struct mxr_buffer {
/** common v4l buffer stuff -- must be first */ /** common v4l buffer stuff -- must be first */
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
/** node for layer's lists */ /** node for layer's lists */
struct list_head list; struct list_head list;
}; };

2
drivers/media/platform/s5p-tv/mixer_grp_layer.c
View File

@ -86,7 +86,7 @@ static void mxr_graph_buffer_set(struct mxr_layer *layer,
dma_addr_t addr = 0; dma_addr_t addr = 0;
if (buf) if (buf)
addr = vb2_dma_contig_plane_dma_addr(&buf->vb, 0); addr = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
mxr_reg_graph_buffer(layer->mdev, layer->idx, addr); mxr_reg_graph_buffer(layer->mdev, layer->idx, addr);
} }

2
drivers/media/platform/s5p-tv/mixer_reg.c
View File

@ -279,7 +279,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
layer->ops.buffer_set(layer, layer->update_buf); layer->ops.buffer_set(layer, layer->update_buf);
if (done && done != layer->shadow_buf) if (done && done != layer->shadow_buf)
vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&done->vb.vb2_buf, VB2_BUF_STATE_DONE);
done: done:
spin_unlock(&layer->enq_slock); spin_unlock(&layer->enq_slock);

11
drivers/media/platform/s5p-tv/mixer_video.c
View File

@ -914,7 +914,8 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *pfmt,
static void buf_queue(struct vb2_buffer *vb) static void buf_queue(struct vb2_buffer *vb)
{ {
struct mxr_buffer *buffer = container_of(vb, struct mxr_buffer, vb); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct mxr_buffer *buffer = container_of(vbuf, struct mxr_buffer, vb);
struct mxr_layer *layer = vb2_get_drv_priv(vb->vb2_queue); struct mxr_layer *layer = vb2_get_drv_priv(vb->vb2_queue);
struct mxr_device *mdev = layer->mdev; struct mxr_device *mdev = layer->mdev;
unsigned long flags; unsigned long flags;
@ -963,11 +964,13 @@ static void mxr_watchdog(unsigned long arg)
if (layer->update_buf == layer->shadow_buf) if (layer->update_buf == layer->shadow_buf)
layer->update_buf = NULL; layer->update_buf = NULL;
if (layer->update_buf) { if (layer->update_buf) {
vb2_buffer_done(&layer->update_buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&layer->update_buf->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
layer->update_buf = NULL; layer->update_buf = NULL;
} }
if (layer->shadow_buf) { if (layer->shadow_buf) {
vb2_buffer_done(&layer->shadow_buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&layer->shadow_buf->vb.vb2_buf,
VB2_BUF_STATE_ERROR);
layer->shadow_buf = NULL; layer->shadow_buf = NULL;
} }
spin_unlock_irqrestore(&layer->enq_slock, flags); spin_unlock_irqrestore(&layer->enq_slock, flags);
@ -991,7 +994,7 @@ static void stop_streaming(struct vb2_queue *vq)
/* set all buffer to be done */ /* set all buffer to be done */
list_for_each_entry_safe(buf, buf_tmp, &layer->enq_list, list) { list_for_each_entry_safe(buf, buf_tmp, &layer->enq_list, list) {
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&layer->enq_slock, flags); spin_unlock_irqrestore(&layer->enq_slock, flags);

5
drivers/media/platform/s5p-tv/mixer_vp_layer.c
View File

@ -97,9 +97,10 @@ static void mxr_vp_buffer_set(struct mxr_layer *layer,
mxr_reg_vp_buffer(layer->mdev, luma_addr, chroma_addr); mxr_reg_vp_buffer(layer->mdev, luma_addr, chroma_addr);
return; return;
} }
luma_addr[0] = vb2_dma_contig_plane_dma_addr(&buf->vb, 0); luma_addr[0] = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
if (layer->fmt->num_subframes == 2) { if (layer->fmt->num_subframes == 2) {
chroma_addr[0] = vb2_dma_contig_plane_dma_addr(&buf->vb, 1); chroma_addr[0] =
vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 1);
} else { } else {
/* FIXME: mxr_get_plane_size compute integer division, /* FIXME: mxr_get_plane_size compute integer division,
* which is slow and should not be performed in interrupt */ * which is slow and should not be performed in interrupt */

19
drivers/media/platform/sh_veu.c
View File

@ -931,9 +931,10 @@ static int sh_veu_buf_prepare(struct vb2_buffer *vb)
static void sh_veu_buf_queue(struct vb2_buffer *vb) static void sh_veu_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct sh_veu_dev *veu = vb2_get_drv_priv(vb->vb2_queue); struct sh_veu_dev *veu = vb2_get_drv_priv(vb->vb2_queue);
dev_dbg(veu->dev, "%s(%d)\n", __func__, vb->v4l2_buf.type); dev_dbg(veu->dev, "%s(%d)\n", __func__, vb->type);
v4l2_m2m_buf_queue(veu->m2m_ctx, vb); v4l2_m2m_buf_queue(veu->m2m_ctx, vbuf);
} }
static const struct vb2_ops sh_veu_qops = { static const struct vb2_ops sh_veu_qops = {
@ -1084,8 +1085,8 @@ static irqreturn_t sh_veu_bh(int irq, void *dev_id)
static irqreturn_t sh_veu_isr(int irq, void *dev_id) static irqreturn_t sh_veu_isr(int irq, void *dev_id)
{ {
struct sh_veu_dev *veu = dev_id; struct sh_veu_dev *veu = dev_id;
struct vb2_buffer *dst; struct vb2_v4l2_buffer *dst;
struct vb2_buffer *src; struct vb2_v4l2_buffer *src;
u32 status = sh_veu_reg_read(veu, VEU_EVTR); u32 status = sh_veu_reg_read(veu, VEU_EVTR);
/* bundle read mode not used */ /* bundle read mode not used */
@ -1105,11 +1106,11 @@ static irqreturn_t sh_veu_isr(int irq, void *dev_id)
if (!src || !dst) if (!src || !dst)
return IRQ_NONE; return IRQ_NONE;
dst->v4l2_buf.timestamp = src->v4l2_buf.timestamp; dst->timestamp = src->timestamp;
dst->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; dst->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst->v4l2_buf.flags |= dst->flags |=
src->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; src->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst->v4l2_buf.timecode = src->v4l2_buf.timecode; dst->timecode = src->timecode;
spin_lock(&veu->lock); spin_lock(&veu->lock);
v4l2_m2m_buf_done(src, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(src, VB2_BUF_STATE_DONE);

26
drivers/media/platform/sh_vou.c
View File

@ -27,6 +27,7 @@
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include <media/v4l2-mediabus.h> #include <media/v4l2-mediabus.h>
#include <media/videobuf2-v4l2.h>
#include <media/videobuf2-dma-contig.h> #include <media/videobuf2-dma-contig.h>
/* Mirror addresses are not available for all registers */ /* Mirror addresses are not available for all registers */
@ -62,11 +63,12 @@ enum sh_vou_status {
#define VOU_MIN_IMAGE_HEIGHT 16 #define VOU_MIN_IMAGE_HEIGHT 16
struct sh_vou_buffer { struct sh_vou_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };
static inline struct sh_vou_buffer *to_sh_vou_buffer(struct vb2_buffer *vb2) static inline struct
sh_vou_buffer *to_sh_vou_buffer(struct vb2_v4l2_buffer *vb2)
{ {
return container_of(vb2, struct sh_vou_buffer, vb); return container_of(vb2, struct sh_vou_buffer, vb);
} }
@ -193,11 +195,11 @@ static struct sh_vou_fmt vou_fmt[] = {
}; };
static void sh_vou_schedule_next(struct sh_vou_device *vou_dev, static void sh_vou_schedule_next(struct sh_vou_device *vou_dev,
struct vb2_buffer *vb) struct vb2_v4l2_buffer *vbuf)
{ {
dma_addr_t addr1, addr2; dma_addr_t addr1, addr2;
addr1 = vb2_dma_contig_plane_dma_addr(vb, 0); addr1 = vb2_dma_contig_plane_dma_addr(&vbuf->vb2_buf, 0);
switch (vou_dev->pix.pixelformat) { switch (vou_dev->pix.pixelformat) {
case V4L2_PIX_FMT_NV12: case V4L2_PIX_FMT_NV12:
case V4L2_PIX_FMT_NV16: case V4L2_PIX_FMT_NV16:
@ -282,8 +284,9 @@ static int sh_vou_buf_prepare(struct vb2_buffer *vb)
/* Locking: caller holds fop_lock mutex and vq->irqlock spinlock */ /* Locking: caller holds fop_lock mutex and vq->irqlock spinlock */
static void sh_vou_buf_queue(struct vb2_buffer *vb) static void sh_vou_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct sh_vou_device *vou_dev = vb2_get_drv_priv(vb->vb2_queue); struct sh_vou_device *vou_dev = vb2_get_drv_priv(vb->vb2_queue);
struct sh_vou_buffer *shbuf = to_sh_vou_buffer(vb); struct sh_vou_buffer *shbuf = to_sh_vou_buffer(vbuf);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&vou_dev->lock, flags); spin_lock_irqsave(&vou_dev->lock, flags);
@ -302,7 +305,8 @@ static int sh_vou_start_streaming(struct vb2_queue *vq, unsigned int count)
video, s_stream, 1); video, s_stream, 1);
if (ret < 0 && ret != -ENOIOCTLCMD) { if (ret < 0 && ret != -ENOIOCTLCMD) {
list_for_each_entry_safe(buf, node, &vou_dev->buf_list, list) { list_for_each_entry_safe(buf, node, &vou_dev->buf_list, list) {
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf,
VB2_BUF_STATE_QUEUED);
list_del(&buf->list); list_del(&buf->list);
} }
vou_dev->active = NULL; vou_dev->active = NULL;
@ -353,7 +357,7 @@ static void sh_vou_stop_streaming(struct vb2_queue *vq)
msleep(50); msleep(50);
spin_lock_irqsave(&vou_dev->lock, flags); spin_lock_irqsave(&vou_dev->lock, flags);
list_for_each_entry_safe(buf, node, &vou_dev->buf_list, list) { list_for_each_entry_safe(buf, node, &vou_dev->buf_list, list) {
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
list_del(&buf->list); list_del(&buf->list);
} }
vou_dev->active = NULL; vou_dev->active = NULL;
@ -1066,10 +1070,10 @@ static irqreturn_t sh_vou_isr(int irq, void *dev_id)
list_del(&vb->list); list_del(&vb->list);
v4l2_get_timestamp(&vb->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&vb->vb.timestamp);
vb->vb.v4l2_buf.sequence = vou_dev->sequence++; vb->vb.sequence = vou_dev->sequence++;
vb->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED; vb->vb.field = V4L2_FIELD_INTERLACED;
vb2_buffer_done(&vb->vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&vb->vb.vb2_buf, VB2_BUF_STATE_DONE);
vou_dev->active = list_entry(vou_dev->buf_list.next, vou_dev->active = list_entry(vou_dev->buf_list.next,
struct sh_vou_buffer, list); struct sh_vou_buffer, list);

26
drivers/media/platform/soc_camera/atmel-isi.c
View File

@ -60,7 +60,7 @@ struct isi_dma_desc {
/* Frame buffer data */ /* Frame buffer data */
struct frame_buffer { struct frame_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct isi_dma_desc *p_dma_desc; struct isi_dma_desc *p_dma_desc;
struct list_head list; struct list_head list;
}; };
@ -161,13 +161,13 @@ static bool is_supported(struct soc_camera_device *icd,
static irqreturn_t atmel_isi_handle_streaming(struct atmel_isi *isi) static irqreturn_t atmel_isi_handle_streaming(struct atmel_isi *isi)
{ {
if (isi->active) { if (isi->active) {
struct vb2_buffer *vb = &isi->active->vb; struct vb2_v4l2_buffer *vbuf = &isi->active->vb;
struct frame_buffer *buf = isi->active; struct frame_buffer *buf = isi->active;
list_del_init(&buf->list); list_del_init(&buf->list);
v4l2_get_timestamp(&vb->v4l2_buf.timestamp); v4l2_get_timestamp(&vbuf->timestamp);
vb->v4l2_buf.sequence = isi->sequence++; vbuf->sequence = isi->sequence++;
vb2_buffer_done(vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_DONE);
} }
if (list_empty(&isi->video_buffer_list)) { if (list_empty(&isi->video_buffer_list)) {
@ -277,7 +277,8 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
static int buffer_init(struct vb2_buffer *vb) static int buffer_init(struct vb2_buffer *vb)
{ {
struct frame_buffer *buf = container_of(vb, struct frame_buffer, vb); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct frame_buffer *buf = container_of(vbuf, struct frame_buffer, vb);
buf->p_dma_desc = NULL; buf->p_dma_desc = NULL;
INIT_LIST_HEAD(&buf->list); INIT_LIST_HEAD(&buf->list);
@ -287,8 +288,9 @@ static int buffer_init(struct vb2_buffer *vb)
static int buffer_prepare(struct vb2_buffer *vb) static int buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue); struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
struct frame_buffer *buf = container_of(vb, struct frame_buffer, vb); struct frame_buffer *buf = container_of(vbuf, struct frame_buffer, vb);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct atmel_isi *isi = ici->priv; struct atmel_isi *isi = ici->priv;
unsigned long size; unsigned long size;
@ -302,7 +304,7 @@ static int buffer_prepare(struct vb2_buffer *vb)
return -EINVAL; return -EINVAL;
} }
vb2_set_plane_payload(&buf->vb, 0, size); vb2_set_plane_payload(vb, 0, size);
if (!buf->p_dma_desc) { if (!buf->p_dma_desc) {
if (list_empty(&isi->dma_desc_head)) { if (list_empty(&isi->dma_desc_head)) {
@ -329,10 +331,11 @@ static int buffer_prepare(struct vb2_buffer *vb)
static void buffer_cleanup(struct vb2_buffer *vb) static void buffer_cleanup(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue); struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct atmel_isi *isi = ici->priv; struct atmel_isi *isi = ici->priv;
struct frame_buffer *buf = container_of(vb, struct frame_buffer, vb); struct frame_buffer *buf = container_of(vbuf, struct frame_buffer, vb);
/* This descriptor is available now and we add to head list */ /* This descriptor is available now and we add to head list */
if (buf->p_dma_desc) if (buf->p_dma_desc)
@ -370,10 +373,11 @@ static void start_dma(struct atmel_isi *isi, struct frame_buffer *buffer)
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue); struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct atmel_isi *isi = ici->priv; struct atmel_isi *isi = ici->priv;
struct frame_buffer *buf = container_of(vb, struct frame_buffer, vb); struct frame_buffer *buf = container_of(vbuf, struct frame_buffer, vb);
unsigned long flags = 0; unsigned long flags = 0;
spin_lock_irqsave(&isi->lock, flags); spin_lock_irqsave(&isi->lock, flags);
@ -435,7 +439,7 @@ static void stop_streaming(struct vb2_queue *vq)
/* Release all active buffers */ /* Release all active buffers */
list_for_each_entry_safe(buf, node, &isi->video_buffer_list, list) { list_for_each_entry_safe(buf, node, &isi->video_buffer_list, list) {
list_del_init(&buf->list); list_del_init(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irq(&isi->lock); spin_unlock_irq(&isi->lock);

19
drivers/media/platform/soc_camera/mx2_camera.c
View File

@ -225,7 +225,7 @@ struct mx2_buf_internal {
/* buffer for one video frame */ /* buffer for one video frame */
struct mx2_buffer { struct mx2_buffer {
/* common v4l buffer stuff -- must be first */ /* common v4l buffer stuff -- must be first */
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct mx2_buf_internal internal; struct mx2_buf_internal internal;
}; };
@ -530,11 +530,12 @@ out:
static void mx2_videobuf_queue(struct vb2_buffer *vb) static void mx2_videobuf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue); struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
struct soc_camera_host *ici = struct soc_camera_host *ici =
to_soc_camera_host(icd->parent); to_soc_camera_host(icd->parent);
struct mx2_camera_dev *pcdev = ici->priv; struct mx2_camera_dev *pcdev = ici->priv;
struct mx2_buffer *buf = container_of(vb, struct mx2_buffer, vb); struct mx2_buffer *buf = container_of(vbuf, struct mx2_buffer, vb);
unsigned long flags; unsigned long flags;
dev_dbg(icd->parent, "%s (vb=0x%p) 0x%p %lu\n", __func__, dev_dbg(icd->parent, "%s (vb=0x%p) 0x%p %lu\n", __func__,
@ -664,7 +665,7 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count)
buf = list_first_entry(&pcdev->capture, struct mx2_buffer, buf = list_first_entry(&pcdev->capture, struct mx2_buffer,
internal.queue); internal.queue);
buf->internal.bufnum = 0; buf->internal.bufnum = 0;
vb = &buf->vb; vb = &buf->vb.vb2_buf;
phys = vb2_dma_contig_plane_dma_addr(vb, 0); phys = vb2_dma_contig_plane_dma_addr(vb, 0);
mx27_update_emma_buf(pcdev, phys, buf->internal.bufnum); mx27_update_emma_buf(pcdev, phys, buf->internal.bufnum);
@ -673,7 +674,7 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count)
buf = list_first_entry(&pcdev->capture, struct mx2_buffer, buf = list_first_entry(&pcdev->capture, struct mx2_buffer,
internal.queue); internal.queue);
buf->internal.bufnum = 1; buf->internal.bufnum = 1;
vb = &buf->vb; vb = &buf->vb.vb2_buf;
phys = vb2_dma_contig_plane_dma_addr(vb, 0); phys = vb2_dma_contig_plane_dma_addr(vb, 0);
mx27_update_emma_buf(pcdev, phys, buf->internal.bufnum); mx27_update_emma_buf(pcdev, phys, buf->internal.bufnum);
@ -1307,6 +1308,7 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
struct mx2_buf_internal *ibuf; struct mx2_buf_internal *ibuf;
struct mx2_buffer *buf; struct mx2_buffer *buf;
struct vb2_buffer *vb; struct vb2_buffer *vb;
struct vb2_v4l2_buffer *vbuf;
unsigned long phys; unsigned long phys;
ibuf = list_first_entry(&pcdev->active_bufs, struct mx2_buf_internal, ibuf = list_first_entry(&pcdev->active_bufs, struct mx2_buf_internal,
@ -1323,7 +1325,8 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
} else { } else {
buf = mx2_ibuf_to_buf(ibuf); buf = mx2_ibuf_to_buf(ibuf);
vb = &buf->vb; vb = &buf->vb.vb2_buf;
vbuf = to_vb2_v4l2_buffer(vb);
#ifdef DEBUG #ifdef DEBUG
phys = vb2_dma_contig_plane_dma_addr(vb, 0); phys = vb2_dma_contig_plane_dma_addr(vb, 0);
if (prp->cfg.channel == 1) { if (prp->cfg.channel == 1) {
@ -1347,8 +1350,8 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
vb2_get_plane_payload(vb, 0)); vb2_get_plane_payload(vb, 0));
list_del_init(&buf->internal.queue); list_del_init(&buf->internal.queue);
v4l2_get_timestamp(&vb->v4l2_buf.timestamp); v4l2_get_timestamp(&vbuf->timestamp);
vb->v4l2_buf.sequence = pcdev->frame_count; vbuf->sequence = pcdev->frame_count;
if (err) if (err)
vb2_buffer_done(vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
else else
@ -1380,7 +1383,7 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
list_move_tail(pcdev->capture.next, &pcdev->active_bufs); list_move_tail(pcdev->capture.next, &pcdev->active_bufs);
vb = &buf->vb; vb = &buf->vb.vb2_buf;
phys = vb2_dma_contig_plane_dma_addr(vb, 0); phys = vb2_dma_contig_plane_dma_addr(vb, 0);
mx27_update_emma_buf(pcdev, phys, bufnum); mx27_update_emma_buf(pcdev, phys, bufnum);

27
drivers/media/platform/soc_camera/mx3_camera.c
View File

@ -63,7 +63,7 @@
struct mx3_camera_buffer { struct mx3_camera_buffer {
/* common v4l buffer stuff -- must be first */ /* common v4l buffer stuff -- must be first */
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head queue; struct list_head queue;
/* One descriptot per scatterlist (per frame) */ /* One descriptot per scatterlist (per frame) */
@ -133,7 +133,7 @@ static void csi_reg_write(struct mx3_camera_dev *mx3, u32 value, off_t reg)
__raw_writel(value, mx3->base + reg); __raw_writel(value, mx3->base + reg);
} }
static struct mx3_camera_buffer *to_mx3_vb(struct vb2_buffer *vb) static struct mx3_camera_buffer *to_mx3_vb(struct vb2_v4l2_buffer *vb)
{ {
return container_of(vb, struct mx3_camera_buffer, vb); return container_of(vb, struct mx3_camera_buffer, vb);
} }
@ -151,14 +151,14 @@ static void mx3_cam_dma_done(void *arg)
spin_lock(&mx3_cam->lock); spin_lock(&mx3_cam->lock);
if (mx3_cam->active) { if (mx3_cam->active) {
struct vb2_buffer *vb = &mx3_cam->active->vb; struct vb2_v4l2_buffer *vb = &mx3_cam->active->vb;
struct mx3_camera_buffer *buf = to_mx3_vb(vb); struct mx3_camera_buffer *buf = to_mx3_vb(vb);
list_del_init(&buf->queue); list_del_init(&buf->queue);
v4l2_get_timestamp(&vb->v4l2_buf.timestamp); v4l2_get_timestamp(&vb->timestamp);
vb->v4l2_buf.field = mx3_cam->field; vb->field = mx3_cam->field;
vb->v4l2_buf.sequence = mx3_cam->sequence++; vb->sequence = mx3_cam->sequence++;
vb2_buffer_done(vb, VB2_BUF_STATE_DONE); vb2_buffer_done(&vb->vb2_buf, VB2_BUF_STATE_DONE);
} }
if (list_empty(&mx3_cam->capture)) { if (list_empty(&mx3_cam->capture)) {
@ -257,10 +257,11 @@ static enum pixel_fmt fourcc_to_ipu_pix(__u32 fourcc)
static void mx3_videobuf_queue(struct vb2_buffer *vb) static void mx3_videobuf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue); struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct mx3_camera_dev *mx3_cam = ici->priv; struct mx3_camera_dev *mx3_cam = ici->priv;
struct mx3_camera_buffer *buf = to_mx3_vb(vb); struct mx3_camera_buffer *buf = to_mx3_vb(vbuf);
struct scatterlist *sg = &buf->sg; struct scatterlist *sg = &buf->sg;
struct dma_async_tx_descriptor *txd; struct dma_async_tx_descriptor *txd;
struct idmac_channel *ichan = mx3_cam->idmac_channel[0]; struct idmac_channel *ichan = mx3_cam->idmac_channel[0];
@ -273,7 +274,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
if (vb2_plane_size(vb, 0) < new_size) { if (vb2_plane_size(vb, 0) < new_size) {
dev_err(icd->parent, "Buffer #%d too small (%lu < %zu)\n", dev_err(icd->parent, "Buffer #%d too small (%lu < %zu)\n",
vb->v4l2_buf.index, vb2_plane_size(vb, 0), new_size); vbuf->vb2_buf.index, vb2_plane_size(vb, 0), new_size);
goto error; goto error;
} }
@ -357,10 +358,11 @@ error:
static void mx3_videobuf_release(struct vb2_buffer *vb) static void mx3_videobuf_release(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue); struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct mx3_camera_dev *mx3_cam = ici->priv; struct mx3_camera_dev *mx3_cam = ici->priv;
struct mx3_camera_buffer *buf = to_mx3_vb(vb); struct mx3_camera_buffer *buf = to_mx3_vb(vbuf);
struct dma_async_tx_descriptor *txd = buf->txd; struct dma_async_tx_descriptor *txd = buf->txd;
unsigned long flags; unsigned long flags;
@ -390,10 +392,11 @@ static void mx3_videobuf_release(struct vb2_buffer *vb)
static int mx3_videobuf_init(struct vb2_buffer *vb) static int mx3_videobuf_init(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue); struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct mx3_camera_dev *mx3_cam = ici->priv; struct mx3_camera_dev *mx3_cam = ici->priv;
struct mx3_camera_buffer *buf = to_mx3_vb(vb); struct mx3_camera_buffer *buf = to_mx3_vb(vbuf);
if (!buf->txd) { if (!buf->txd) {
/* This is for locking debugging only */ /* This is for locking debugging only */
@ -424,7 +427,7 @@ static void mx3_stop_streaming(struct vb2_queue *q)
list_for_each_entry_safe(buf, tmp, &mx3_cam->capture, queue) { list_for_each_entry_safe(buf, tmp, &mx3_cam->capture, queue) {
list_del_init(&buf->queue); list_del_init(&buf->queue);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
spin_unlock_irqrestore(&mx3_cam->lock, flags); spin_unlock_irqrestore(&mx3_cam->lock, flags);

45
drivers/media/platform/soc_camera/rcar_vin.c
View File

@ -478,7 +478,7 @@ struct rcar_vin_priv {
struct soc_camera_host ici; struct soc_camera_host ici;
struct list_head capture; struct list_head capture;
#define MAX_BUFFER_NUM 3 #define MAX_BUFFER_NUM 3
struct vb2_buffer *queue_buf[MAX_BUFFER_NUM]; struct vb2_v4l2_buffer *queue_buf[MAX_BUFFER_NUM];
struct vb2_alloc_ctx *alloc_ctx; struct vb2_alloc_ctx *alloc_ctx;
enum v4l2_field field; enum v4l2_field field;
unsigned int pdata_flags; unsigned int pdata_flags;
@ -492,7 +492,7 @@ struct rcar_vin_priv {
#define is_continuous_transfer(priv) (priv->vb_count > MAX_BUFFER_NUM) #define is_continuous_transfer(priv) (priv->vb_count > MAX_BUFFER_NUM)
struct rcar_vin_buffer { struct rcar_vin_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };
@ -748,7 +748,7 @@ static int rcar_vin_hw_ready(struct rcar_vin_priv *priv)
/* Moves a buffer from the queue to the HW slots */ /* Moves a buffer from the queue to the HW slots */
static int rcar_vin_fill_hw_slot(struct rcar_vin_priv *priv) static int rcar_vin_fill_hw_slot(struct rcar_vin_priv *priv)
{ {
struct vb2_buffer *vb; struct vb2_v4l2_buffer *vbuf;
dma_addr_t phys_addr_top; dma_addr_t phys_addr_top;
int slot; int slot;
@ -760,10 +760,11 @@ static int rcar_vin_fill_hw_slot(struct rcar_vin_priv *priv)
if (slot < 0) if (slot < 0)
return 0; return 0;
vb = &list_entry(priv->capture.next, struct rcar_vin_buffer, list)->vb; vbuf = &list_entry(priv->capture.next,
list_del_init(to_buf_list(vb)); struct rcar_vin_buffer, list)->vb;
priv->queue_buf[slot] = vb; list_del_init(to_buf_list(vbuf));
phys_addr_top = vb2_dma_contig_plane_dma_addr(vb, 0); priv->queue_buf[slot] = vbuf;
phys_addr_top = vb2_dma_contig_plane_dma_addr(&vbuf->vb2_buf, 0);
iowrite32(phys_addr_top, priv->base + VNMB_REG(slot)); iowrite32(phys_addr_top, priv->base + VNMB_REG(slot));
return 1; return 1;
@ -771,6 +772,7 @@ static int rcar_vin_fill_hw_slot(struct rcar_vin_priv *priv)
static void rcar_vin_videobuf_queue(struct vb2_buffer *vb) static void rcar_vin_videobuf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue); struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct rcar_vin_priv *priv = ici->priv; struct rcar_vin_priv *priv = ici->priv;
@ -780,7 +782,7 @@ static void rcar_vin_videobuf_queue(struct vb2_buffer *vb)
if (vb2_plane_size(vb, 0) < size) { if (vb2_plane_size(vb, 0) < size) {
dev_err(icd->parent, "Buffer #%d too small (%lu < %lu)\n", dev_err(icd->parent, "Buffer #%d too small (%lu < %lu)\n",
vb->v4l2_buf.index, vb2_plane_size(vb, 0), size); vb->index, vb2_plane_size(vb, 0), size);
goto error; goto error;
} }
@ -791,14 +793,14 @@ static void rcar_vin_videobuf_queue(struct vb2_buffer *vb)
spin_lock_irq(&priv->lock); spin_lock_irq(&priv->lock);
list_add_tail(to_buf_list(vb), &priv->capture); list_add_tail(to_buf_list(vbuf), &priv->capture);
rcar_vin_fill_hw_slot(priv); rcar_vin_fill_hw_slot(priv);
/* If we weren't running, and have enough buffers, start capturing! */ /* If we weren't running, and have enough buffers, start capturing! */
if (priv->state != RUNNING && rcar_vin_hw_ready(priv)) { if (priv->state != RUNNING && rcar_vin_hw_ready(priv)) {
if (rcar_vin_setup(priv)) { if (rcar_vin_setup(priv)) {
/* Submit error */ /* Submit error */
list_del_init(to_buf_list(vb)); list_del_init(to_buf_list(vbuf));
spin_unlock_irq(&priv->lock); spin_unlock_irq(&priv->lock);
goto error; goto error;
} }
@ -854,7 +856,7 @@ static void rcar_vin_stop_streaming(struct vb2_queue *vq)
for (i = 0; i < MAX_BUFFER_NUM; i++) { for (i = 0; i < MAX_BUFFER_NUM; i++) {
if (priv->queue_buf[i]) { if (priv->queue_buf[i]) {
vb2_buffer_done(priv->queue_buf[i], vb2_buffer_done(&priv->queue_buf[i]->vb2_buf,
VB2_BUF_STATE_ERROR); VB2_BUF_STATE_ERROR);
priv->queue_buf[i] = NULL; priv->queue_buf[i] = NULL;
} }
@ -862,7 +864,7 @@ static void rcar_vin_stop_streaming(struct vb2_queue *vq)
list_for_each_safe(buf_head, tmp, &priv->capture) { list_for_each_safe(buf_head, tmp, &priv->capture) {
vb2_buffer_done(&list_entry(buf_head, vb2_buffer_done(&list_entry(buf_head,
struct rcar_vin_buffer, list)->vb, struct rcar_vin_buffer, list)->vb.vb2_buf,
VB2_BUF_STATE_ERROR); VB2_BUF_STATE_ERROR);
list_del_init(buf_head); list_del_init(buf_head);
} }
@ -907,10 +909,11 @@ static irqreturn_t rcar_vin_irq(int irq, void *data)
else else
slot = 0; slot = 0;
priv->queue_buf[slot]->v4l2_buf.field = priv->field; priv->queue_buf[slot]->field = priv->field;
priv->queue_buf[slot]->v4l2_buf.sequence = priv->sequence++; priv->queue_buf[slot]->sequence = priv->sequence++;
v4l2_get_timestamp(&priv->queue_buf[slot]->v4l2_buf.timestamp); v4l2_get_timestamp(&priv->queue_buf[slot]->timestamp);
vb2_buffer_done(priv->queue_buf[slot], VB2_BUF_STATE_DONE); vb2_buffer_done(&priv->queue_buf[slot]->vb2_buf,
VB2_BUF_STATE_DONE);
priv->queue_buf[slot] = NULL; priv->queue_buf[slot] = NULL;
if (priv->state != STOPPING) if (priv->state != STOPPING)
@ -964,7 +967,7 @@ static void rcar_vin_remove_device(struct soc_camera_device *icd)
{ {
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct rcar_vin_priv *priv = ici->priv; struct rcar_vin_priv *priv = ici->priv;
struct vb2_buffer *vb; struct vb2_v4l2_buffer *vbuf;
int i; int i;
/* disable capture, disable interrupts */ /* disable capture, disable interrupts */
@ -978,10 +981,10 @@ static void rcar_vin_remove_device(struct soc_camera_device *icd)
/* make sure active buffer is cancelled */ /* make sure active buffer is cancelled */
spin_lock_irq(&priv->lock); spin_lock_irq(&priv->lock);
for (i = 0; i < MAX_BUFFER_NUM; i++) { for (i = 0; i < MAX_BUFFER_NUM; i++) {
vb = priv->queue_buf[i]; vbuf = priv->queue_buf[i];
if (vb) { if (vbuf) {
list_del_init(to_buf_list(vb)); list_del_init(to_buf_list(vbuf));
vb2_buffer_done(vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_ERROR);
} }
} }
spin_unlock_irq(&priv->lock); spin_unlock_irq(&priv->lock);

57
drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
View File

@ -93,7 +93,7 @@
/* per video frame buffer */ /* per video frame buffer */
struct sh_mobile_ceu_buffer { struct sh_mobile_ceu_buffer {
struct vb2_buffer vb; /* v4l buffer must be first */ struct vb2_v4l2_buffer vb; /* v4l buffer must be first */
struct list_head queue; struct list_head queue;
}; };
@ -112,7 +112,7 @@ struct sh_mobile_ceu_dev {
spinlock_t lock; /* Protects video buffer lists */ spinlock_t lock; /* Protects video buffer lists */
struct list_head capture; struct list_head capture;
struct vb2_buffer *active; struct vb2_v4l2_buffer *active;
struct vb2_alloc_ctx *alloc_ctx; struct vb2_alloc_ctx *alloc_ctx;
struct sh_mobile_ceu_info *pdata; struct sh_mobile_ceu_info *pdata;
@ -152,9 +152,9 @@ struct sh_mobile_ceu_cam {
u32 code; u32 code;
}; };
static struct sh_mobile_ceu_buffer *to_ceu_vb(struct vb2_buffer *vb) static struct sh_mobile_ceu_buffer *to_ceu_vb(struct vb2_v4l2_buffer *vbuf)
{ {
return container_of(vb, struct sh_mobile_ceu_buffer, vb); return container_of(vbuf, struct sh_mobile_ceu_buffer, vb);
} }
static void ceu_write(struct sh_mobile_ceu_dev *priv, static void ceu_write(struct sh_mobile_ceu_dev *priv,
@ -334,7 +334,8 @@ static int sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
bottom2 = CDBCR; bottom2 = CDBCR;
} }
phys_addr_top = vb2_dma_contig_plane_dma_addr(pcdev->active, 0); phys_addr_top =
vb2_dma_contig_plane_dma_addr(&pcdev->active->vb2_buf, 0);
switch (icd->current_fmt->host_fmt->fourcc) { switch (icd->current_fmt->host_fmt->fourcc) {
case V4L2_PIX_FMT_NV12: case V4L2_PIX_FMT_NV12:
@ -369,7 +370,8 @@ static int sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
static int sh_mobile_ceu_videobuf_prepare(struct vb2_buffer *vb) static int sh_mobile_ceu_videobuf_prepare(struct vb2_buffer *vb)
{ {
struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vb); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vbuf);
/* Added list head initialization on alloc */ /* Added list head initialization on alloc */
WARN(!list_empty(&buf->queue), "Buffer %p on queue!\n", vb); WARN(!list_empty(&buf->queue), "Buffer %p on queue!\n", vb);
@ -379,17 +381,19 @@ static int sh_mobile_ceu_videobuf_prepare(struct vb2_buffer *vb)
static void sh_mobile_ceu_videobuf_queue(struct vb2_buffer *vb) static void sh_mobile_ceu_videobuf_queue(struct vb2_buffer *vb)
{ {
struct soc_camera_device *icd = container_of(vb->vb2_queue, struct soc_camera_device, vb2_vidq); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct soc_camera_device *icd = container_of(vb->vb2_queue,
struct soc_camera_device, vb2_vidq);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct sh_mobile_ceu_dev *pcdev = ici->priv; struct sh_mobile_ceu_dev *pcdev = ici->priv;
struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vb); struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vbuf);
unsigned long size; unsigned long size;
size = icd->sizeimage; size = icd->sizeimage;
if (vb2_plane_size(vb, 0) < size) { if (vb2_plane_size(vb, 0) < size) {
dev_err(icd->parent, "Buffer #%d too small (%lu < %lu)\n", dev_err(icd->parent, "Buffer #%d too small (%lu < %lu)\n",
vb->v4l2_buf.index, vb2_plane_size(vb, 0), size); vb->index, vb2_plane_size(vb, 0), size);
goto error; goto error;
} }
@ -416,7 +420,7 @@ static void sh_mobile_ceu_videobuf_queue(struct vb2_buffer *vb)
* we are not interested in the return value of * we are not interested in the return value of
* sh_mobile_ceu_capture here. * sh_mobile_ceu_capture here.
*/ */
pcdev->active = vb; pcdev->active = vbuf;
sh_mobile_ceu_capture(pcdev); sh_mobile_ceu_capture(pcdev);
} }
spin_unlock_irq(&pcdev->lock); spin_unlock_irq(&pcdev->lock);
@ -429,14 +433,16 @@ error:
static void sh_mobile_ceu_videobuf_release(struct vb2_buffer *vb) static void sh_mobile_ceu_videobuf_release(struct vb2_buffer *vb)
{ {
struct soc_camera_device *icd = container_of(vb->vb2_queue, struct soc_camera_device, vb2_vidq); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct soc_camera_device *icd = container_of(vb->vb2_queue,
struct soc_camera_device, vb2_vidq);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vb); struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vbuf);
struct sh_mobile_ceu_dev *pcdev = ici->priv; struct sh_mobile_ceu_dev *pcdev = ici->priv;
spin_lock_irq(&pcdev->lock); spin_lock_irq(&pcdev->lock);
if (pcdev->active == vb) { if (pcdev->active == vbuf) {
/* disable capture (release DMA buffer), reset */ /* disable capture (release DMA buffer), reset */
ceu_write(pcdev, CAPSR, 1 << 16); ceu_write(pcdev, CAPSR, 1 << 16);
pcdev->active = NULL; pcdev->active = NULL;
@ -458,7 +464,9 @@ static void sh_mobile_ceu_videobuf_release(struct vb2_buffer *vb)
static int sh_mobile_ceu_videobuf_init(struct vb2_buffer *vb) static int sh_mobile_ceu_videobuf_init(struct vb2_buffer *vb)
{ {
struct soc_camera_device *icd = container_of(vb->vb2_queue, struct soc_camera_device, vb2_vidq); struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct soc_camera_device *icd = container_of(vb->vb2_queue,
struct soc_camera_device, vb2_vidq);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct sh_mobile_ceu_dev *pcdev = ici->priv; struct sh_mobile_ceu_dev *pcdev = ici->priv;
@ -467,7 +475,7 @@ static int sh_mobile_ceu_videobuf_init(struct vb2_buffer *vb)
pcdev->buf_total); pcdev->buf_total);
/* This is for locking debugging only */ /* This is for locking debugging only */
INIT_LIST_HEAD(&to_ceu_vb(vb)->queue); INIT_LIST_HEAD(&to_ceu_vb(vbuf)->queue);
return 0; return 0;
} }
@ -504,17 +512,17 @@ static struct vb2_ops sh_mobile_ceu_videobuf_ops = {
static irqreturn_t sh_mobile_ceu_irq(int irq, void *data) static irqreturn_t sh_mobile_ceu_irq(int irq, void *data)
{ {
struct sh_mobile_ceu_dev *pcdev = data; struct sh_mobile_ceu_dev *pcdev = data;
struct vb2_buffer *vb; struct vb2_v4l2_buffer *vbuf;
int ret; int ret;
spin_lock(&pcdev->lock); spin_lock(&pcdev->lock);
vb = pcdev->active; vbuf = pcdev->active;
if (!vb) if (!vbuf)
/* Stale interrupt from a released buffer */ /* Stale interrupt from a released buffer */
goto out; goto out;
list_del_init(&to_ceu_vb(vb)->queue); list_del_init(&to_ceu_vb(vbuf)->queue);
if (!list_empty(&pcdev->capture)) if (!list_empty(&pcdev->capture))
pcdev->active = &list_entry(pcdev->capture.next, pcdev->active = &list_entry(pcdev->capture.next,
@ -523,12 +531,13 @@ static irqreturn_t sh_mobile_ceu_irq(int irq, void *data)
pcdev->active = NULL; pcdev->active = NULL;
ret = sh_mobile_ceu_capture(pcdev); ret = sh_mobile_ceu_capture(pcdev);
v4l2_get_timestamp(&vb->v4l2_buf.timestamp); v4l2_get_timestamp(&vbuf->timestamp);
if (!ret) { if (!ret) {
vb->v4l2_buf.field = pcdev->field; vbuf->field = pcdev->field;
vb->v4l2_buf.sequence = pcdev->sequence++; vbuf->sequence = pcdev->sequence++;
} }
vb2_buffer_done(vb, ret < 0 ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); vb2_buffer_done(&vbuf->vb2_buf,
ret < 0 ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
out: out:
spin_unlock(&pcdev->lock); spin_unlock(&pcdev->lock);
@ -633,7 +642,7 @@ static void sh_mobile_ceu_clock_stop(struct soc_camera_host *ici)
spin_lock_irq(&pcdev->lock); spin_lock_irq(&pcdev->lock);
if (pcdev->active) { if (pcdev->active) {
list_del_init(&to_ceu_vb(pcdev->active)->queue); list_del_init(&to_ceu_vb(pcdev->active)->queue);
vb2_buffer_done(pcdev->active, VB2_BUF_STATE_ERROR); vb2_buffer_done(&pcdev->active->vb2_buf, VB2_BUF_STATE_ERROR);
pcdev->active = NULL; pcdev->active = NULL;
} }
spin_unlock_irq(&pcdev->lock); spin_unlock_irq(&pcdev->lock);

23
drivers/media/platform/sti/bdisp/bdisp-v4l2.c
View File

@ -180,7 +180,7 @@ static struct bdisp_frame *ctx_get_frame(struct bdisp_ctx *ctx,
static void bdisp_job_finish(struct bdisp_ctx *ctx, int vb_state) static void bdisp_job_finish(struct bdisp_ctx *ctx, int vb_state)
{ {
struct vb2_buffer *src_vb, *dst_vb; struct vb2_v4l2_buffer *src_vb, *dst_vb;
if (WARN(!ctx || !ctx->fh.m2m_ctx, "Null hardware context\n")) if (WARN(!ctx || !ctx->fh.m2m_ctx, "Null hardware context\n"))
return; return;
@ -191,10 +191,10 @@ static void bdisp_job_finish(struct bdisp_ctx *ctx, int vb_state)
dst_vb = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); dst_vb = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
if (src_vb && dst_vb) { if (src_vb && dst_vb) {
dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp; dst_vb->timestamp = src_vb->timestamp;
dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode; dst_vb->timecode = src_vb->timecode;
dst_vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; dst_vb->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
dst_vb->v4l2_buf.flags |= src_vb->v4l2_buf.flags & dst_vb->flags |= src_vb->flags &
V4L2_BUF_FLAG_TSTAMP_SRC_MASK; V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
v4l2_m2m_buf_done(src_vb, vb_state); v4l2_m2m_buf_done(src_vb, vb_state);
@ -281,23 +281,23 @@ static int bdisp_get_addr(struct bdisp_ctx *ctx, struct vb2_buffer *vb,
static int bdisp_get_bufs(struct bdisp_ctx *ctx) static int bdisp_get_bufs(struct bdisp_ctx *ctx)
{ {
struct bdisp_frame *src, *dst; struct bdisp_frame *src, *dst;
struct vb2_buffer *src_vb, *dst_vb; struct vb2_v4l2_buffer *src_vb, *dst_vb;
int ret; int ret;
src = &ctx->src; src = &ctx->src;
dst = &ctx->dst; dst = &ctx->dst;
src_vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx); src_vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
ret = bdisp_get_addr(ctx, src_vb, src, src->paddr); ret = bdisp_get_addr(ctx, &src_vb->vb2_buf, src, src->paddr);
if (ret) if (ret)
return ret; return ret;
dst_vb = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); dst_vb = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
ret = bdisp_get_addr(ctx, dst_vb, dst, dst->paddr); ret = bdisp_get_addr(ctx, &dst_vb->vb2_buf, dst, dst->paddr);
if (ret) if (ret)
return ret; return ret;
dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp; dst_vb->timestamp = src_vb->timestamp;
return 0; return 0;
} }
@ -483,6 +483,7 @@ static int bdisp_buf_prepare(struct vb2_buffer *vb)
static void bdisp_buf_queue(struct vb2_buffer *vb) static void bdisp_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct bdisp_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct bdisp_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
/* return to V4L2 any 0-size buffer so it can be dequeued by user */ /* return to V4L2 any 0-size buffer so it can be dequeued by user */
@ -493,13 +494,13 @@ static void bdisp_buf_queue(struct vb2_buffer *vb)
} }
if (ctx->fh.m2m_ctx) if (ctx->fh.m2m_ctx)
v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb); v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
} }
static int bdisp_start_streaming(struct vb2_queue *q, unsigned int count) static int bdisp_start_streaming(struct vb2_queue *q, unsigned int count)
{ {
struct bdisp_ctx *ctx = q->drv_priv; struct bdisp_ctx *ctx = q->drv_priv;
struct vb2_buffer *buf; struct vb2_v4l2_buffer *buf;
int ret = pm_runtime_get_sync(ctx->bdisp_dev->dev); int ret = pm_runtime_get_sync(ctx->bdisp_dev->dev);
if (ret < 0) { if (ret < 0) {

40
drivers/media/platform/ti-vpe/vpe.c
View File

@ -384,8 +384,8 @@ struct vpe_ctx {
unsigned int bufs_completed; /* bufs done in this batch */ unsigned int bufs_completed; /* bufs done in this batch */
struct vpe_q_data q_data[2]; /* src & dst queue data */ struct vpe_q_data q_data[2]; /* src & dst queue data */
struct vb2_buffer *src_vbs[VPE_MAX_SRC_BUFS]; struct vb2_v4l2_buffer *src_vbs[VPE_MAX_SRC_BUFS];
struct vb2_buffer *dst_vb; struct vb2_v4l2_buffer *dst_vb;
dma_addr_t mv_buf_dma[2]; /* dma addrs of motion vector in/out bufs */ dma_addr_t mv_buf_dma[2]; /* dma addrs of motion vector in/out bufs */
void *mv_buf[2]; /* virtual addrs of motion vector bufs */ void *mv_buf[2]; /* virtual addrs of motion vector bufs */
@ -988,7 +988,7 @@ static void add_out_dtd(struct vpe_ctx *ctx, int port)
{ {
struct vpe_q_data *q_data = &ctx->q_data[Q_DATA_DST]; struct vpe_q_data *q_data = &ctx->q_data[Q_DATA_DST];
const struct vpe_port_data *p_data = &port_data[port]; const struct vpe_port_data *p_data = &port_data[port];
struct vb2_buffer *vb = ctx->dst_vb; struct vb2_buffer *vb = &ctx->dst_vb->vb2_buf;
struct vpe_fmt *fmt = q_data->fmt; struct vpe_fmt *fmt = q_data->fmt;
const struct vpdma_data_format *vpdma_fmt; const struct vpdma_data_format *vpdma_fmt;
int mv_buf_selector = !ctx->src_mv_buf_selector; int mv_buf_selector = !ctx->src_mv_buf_selector;
@ -1025,11 +1025,12 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port)
{ {
struct vpe_q_data *q_data = &ctx->q_data[Q_DATA_SRC]; struct vpe_q_data *q_data = &ctx->q_data[Q_DATA_SRC];
const struct vpe_port_data *p_data = &port_data[port]; const struct vpe_port_data *p_data = &port_data[port];
struct vb2_buffer *vb = ctx->src_vbs[p_data->vb_index]; struct vb2_buffer *vb = &ctx->src_vbs[p_data->vb_index]->vb2_buf;
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vpe_fmt *fmt = q_data->fmt; struct vpe_fmt *fmt = q_data->fmt;
const struct vpdma_data_format *vpdma_fmt; const struct vpdma_data_format *vpdma_fmt;
int mv_buf_selector = ctx->src_mv_buf_selector; int mv_buf_selector = ctx->src_mv_buf_selector;
int field = vb->v4l2_buf.field == V4L2_FIELD_BOTTOM; int field = vbuf->field == V4L2_FIELD_BOTTOM;
int frame_width, frame_height; int frame_width, frame_height;
dma_addr_t dma_addr; dma_addr_t dma_addr;
u32 flags = 0; u32 flags = 0;
@ -1222,8 +1223,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
struct vpe_dev *dev = (struct vpe_dev *)data; struct vpe_dev *dev = (struct vpe_dev *)data;
struct vpe_ctx *ctx; struct vpe_ctx *ctx;
struct vpe_q_data *d_q_data; struct vpe_q_data *d_q_data;
struct vb2_buffer *s_vb, *d_vb; struct vb2_v4l2_buffer *s_vb, *d_vb;
struct v4l2_buffer *s_buf, *d_buf;
unsigned long flags; unsigned long flags;
u32 irqst0, irqst1; u32 irqst0, irqst1;
@ -1286,20 +1286,18 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
s_vb = ctx->src_vbs[0]; s_vb = ctx->src_vbs[0];
d_vb = ctx->dst_vb; d_vb = ctx->dst_vb;
s_buf = &s_vb->v4l2_buf;
d_buf = &d_vb->v4l2_buf;
d_buf->flags = s_buf->flags; d_vb->flags = s_vb->flags;
d_vb->timestamp = s_vb->timestamp;
d_buf->timestamp = s_buf->timestamp; if (s_vb->flags & V4L2_BUF_FLAG_TIMECODE)
if (s_buf->flags & V4L2_BUF_FLAG_TIMECODE) d_vb->timecode = s_vb->timecode;
d_buf->timecode = s_buf->timecode;
d_buf->sequence = ctx->sequence; d_vb->sequence = ctx->sequence;
d_q_data = &ctx->q_data[Q_DATA_DST]; d_q_data = &ctx->q_data[Q_DATA_DST];
if (d_q_data->flags & Q_DATA_INTERLACED) { if (d_q_data->flags & Q_DATA_INTERLACED) {
d_buf->field = ctx->field; d_vb->field = ctx->field;
if (ctx->field == V4L2_FIELD_BOTTOM) { if (ctx->field == V4L2_FIELD_BOTTOM) {
ctx->sequence++; ctx->sequence++;
ctx->field = V4L2_FIELD_TOP; ctx->field = V4L2_FIELD_TOP;
@ -1308,7 +1306,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
ctx->field = V4L2_FIELD_BOTTOM; ctx->field = V4L2_FIELD_BOTTOM;
} }
} else { } else {
d_buf->field = V4L2_FIELD_NONE; d_vb->field = V4L2_FIELD_NONE;
ctx->sequence++; ctx->sequence++;
} }
@ -1825,6 +1823,7 @@ static int vpe_queue_setup(struct vb2_queue *vq,
static int vpe_buf_prepare(struct vb2_buffer *vb) static int vpe_buf_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vpe_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct vpe_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
struct vpe_q_data *q_data; struct vpe_q_data *q_data;
int i, num_planes; int i, num_planes;
@ -1836,10 +1835,10 @@ static int vpe_buf_prepare(struct vb2_buffer *vb)
if (vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { if (vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
if (!(q_data->flags & Q_DATA_INTERLACED)) { if (!(q_data->flags & Q_DATA_INTERLACED)) {
vb->v4l2_buf.field = V4L2_FIELD_NONE; vbuf->field = V4L2_FIELD_NONE;
} else { } else {
if (vb->v4l2_buf.field != V4L2_FIELD_TOP && if (vbuf->field != V4L2_FIELD_TOP &&
vb->v4l2_buf.field != V4L2_FIELD_BOTTOM) vbuf->field != V4L2_FIELD_BOTTOM)
return -EINVAL; return -EINVAL;
} }
} }
@ -1862,9 +1861,10 @@ static int vpe_buf_prepare(struct vb2_buffer *vb)
static void vpe_buf_queue(struct vb2_buffer *vb) static void vpe_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vpe_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct vpe_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb); v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
} }
static int vpe_start_streaming(struct vb2_queue *q, unsigned int count) static int vpe_start_streaming(struct vb2_queue *q, unsigned int count)

51
drivers/media/platform/vim2m.c
View File

@ -197,8 +197,8 @@ static struct vim2m_q_data *get_q_data(struct vim2m_ctx *ctx,
static int device_process(struct vim2m_ctx *ctx, static int device_process(struct vim2m_ctx *ctx,
struct vb2_buffer *in_vb, struct vb2_v4l2_buffer *in_vb,
struct vb2_buffer *out_vb) struct vb2_v4l2_buffer *out_vb)
{ {
struct vim2m_dev *dev = ctx->dev; struct vim2m_dev *dev = ctx->dev;
struct vim2m_q_data *q_data; struct vim2m_q_data *q_data;
@ -213,15 +213,16 @@ static int device_process(struct vim2m_ctx *ctx,
height = q_data->height; height = q_data->height;
bytesperline = (q_data->width * q_data->fmt->depth) >> 3; bytesperline = (q_data->width * q_data->fmt->depth) >> 3;
p_in = vb2_plane_vaddr(in_vb, 0); p_in = vb2_plane_vaddr(&in_vb->vb2_buf, 0);
p_out = vb2_plane_vaddr(out_vb, 0); p_out = vb2_plane_vaddr(&out_vb->vb2_buf, 0);
if (!p_in || !p_out) { if (!p_in || !p_out) {
v4l2_err(&dev->v4l2_dev, v4l2_err(&dev->v4l2_dev,
"Acquiring kernel pointers to buffers failed\n"); "Acquiring kernel pointers to buffers failed\n");
return -EFAULT; return -EFAULT;
} }
if (vb2_plane_size(in_vb, 0) > vb2_plane_size(out_vb, 0)) { if (vb2_plane_size(&in_vb->vb2_buf, 0) >
vb2_plane_size(&out_vb->vb2_buf, 0)) {
v4l2_err(&dev->v4l2_dev, "Output buffer is too small\n"); v4l2_err(&dev->v4l2_dev, "Output buffer is too small\n");
return -EINVAL; return -EINVAL;
} }
@ -231,13 +232,15 @@ static int device_process(struct vim2m_ctx *ctx,
bytes_left = bytesperline - tile_w * MEM2MEM_NUM_TILES; bytes_left = bytesperline - tile_w * MEM2MEM_NUM_TILES;
w = 0; w = 0;
out_vb->v4l2_buf.sequence = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE)->sequence++; out_vb->sequence =
in_vb->v4l2_buf.sequence = q_data->sequence++; get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE)->sequence++;
out_vb->v4l2_buf.timestamp = in_vb->v4l2_buf.timestamp; in_vb->sequence = q_data->sequence++;
if (in_vb->v4l2_buf.flags & V4L2_BUF_FLAG_TIMECODE) out_vb->timestamp = in_vb->timestamp;
out_vb->v4l2_buf.timecode = in_vb->v4l2_buf.timecode;
out_vb->v4l2_buf.field = in_vb->v4l2_buf.field; if (in_vb->flags & V4L2_BUF_FLAG_TIMECODE)
out_vb->v4l2_buf.flags = in_vb->v4l2_buf.flags & out_vb->timecode = in_vb->timecode;
out_vb->field = in_vb->field;
out_vb->flags = in_vb->flags &
(V4L2_BUF_FLAG_TIMECODE | (V4L2_BUF_FLAG_TIMECODE |
V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_KEYFRAME |
V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_PFRAME |
@ -371,7 +374,7 @@ static void device_run(void *priv)
{ {
struct vim2m_ctx *ctx = priv; struct vim2m_ctx *ctx = priv;
struct vim2m_dev *dev = ctx->dev; struct vim2m_dev *dev = ctx->dev;
struct vb2_buffer *src_buf, *dst_buf; struct vb2_v4l2_buffer *src_buf, *dst_buf;
src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx); src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
@ -386,7 +389,7 @@ static void device_isr(unsigned long priv)
{ {
struct vim2m_dev *vim2m_dev = (struct vim2m_dev *)priv; struct vim2m_dev *vim2m_dev = (struct vim2m_dev *)priv;
struct vim2m_ctx *curr_ctx; struct vim2m_ctx *curr_ctx;
struct vb2_buffer *src_vb, *dst_vb; struct vb2_v4l2_buffer *src_vb, *dst_vb;
unsigned long flags; unsigned long flags;
curr_ctx = v4l2_m2m_get_curr_priv(vim2m_dev->m2m_dev); curr_ctx = v4l2_m2m_get_curr_priv(vim2m_dev->m2m_dev);
@ -744,6 +747,7 @@ static int vim2m_queue_setup(struct vb2_queue *vq,
static int vim2m_buf_prepare(struct vb2_buffer *vb) static int vim2m_buf_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vim2m_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct vim2m_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
struct vim2m_q_data *q_data; struct vim2m_q_data *q_data;
@ -751,9 +755,9 @@ static int vim2m_buf_prepare(struct vb2_buffer *vb)
q_data = get_q_data(ctx, vb->vb2_queue->type); q_data = get_q_data(ctx, vb->vb2_queue->type);
if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) { if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
if (vb->v4l2_buf.field == V4L2_FIELD_ANY) if (vbuf->field == V4L2_FIELD_ANY)
vb->v4l2_buf.field = V4L2_FIELD_NONE; vbuf->field = V4L2_FIELD_NONE;
if (vb->v4l2_buf.field != V4L2_FIELD_NONE) { if (vbuf->field != V4L2_FIELD_NONE) {
dprintk(ctx->dev, "%s field isn't supported\n", dprintk(ctx->dev, "%s field isn't supported\n",
__func__); __func__);
return -EINVAL; return -EINVAL;
@ -773,9 +777,10 @@ static int vim2m_buf_prepare(struct vb2_buffer *vb)
static void vim2m_buf_queue(struct vb2_buffer *vb) static void vim2m_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vim2m_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue); struct vim2m_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb); v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
} }
static int vim2m_start_streaming(struct vb2_queue *q, unsigned count) static int vim2m_start_streaming(struct vb2_queue *q, unsigned count)
@ -790,18 +795,18 @@ static int vim2m_start_streaming(struct vb2_queue *q, unsigned count)
static void vim2m_stop_streaming(struct vb2_queue *q) static void vim2m_stop_streaming(struct vb2_queue *q)
{ {
struct vim2m_ctx *ctx = vb2_get_drv_priv(q); struct vim2m_ctx *ctx = vb2_get_drv_priv(q);
struct vb2_buffer *vb; struct vb2_v4l2_buffer *vbuf;
unsigned long flags; unsigned long flags;
for (;;) { for (;;) {
if (V4L2_TYPE_IS_OUTPUT(q->type)) if (V4L2_TYPE_IS_OUTPUT(q->type))
vb = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx); vbuf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
else else
vb = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); vbuf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
if (vb == NULL) if (vbuf == NULL)
return; return;
spin_lock_irqsave(&ctx->dev->irqlock, flags); spin_lock_irqsave(&ctx->dev->irqlock, flags);
v4l2_m2m_buf_done(vb, VB2_BUF_STATE_ERROR); v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
spin_unlock_irqrestore(&ctx->dev->irqlock, flags); spin_unlock_irqrestore(&ctx->dev->irqlock, flags);
} }
} }

2
drivers/media/platform/vivid/vivid-core.h
View File

@ -93,7 +93,7 @@ extern struct vivid_fmt vivid_formats[];
/* buffer for one video frame */ /* buffer for one video frame */
struct vivid_buffer { struct vivid_buffer {
/* common v4l buffer stuff -- must be first */ /* common v4l buffer stuff -- must be first */
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };

73
drivers/media/platform/vivid/vivid-kthread-cap.c
View File

@ -236,8 +236,8 @@ static void *plane_vaddr(struct tpg_data *tpg, struct vivid_buffer *buf,
void *vbuf; void *vbuf;
if (p == 0 || tpg_g_buffers(tpg) > 1) if (p == 0 || tpg_g_buffers(tpg) > 1)
return vb2_plane_vaddr(&buf->vb, p); return vb2_plane_vaddr(&buf->vb.vb2_buf, p);
vbuf = vb2_plane_vaddr(&buf->vb, 0); vbuf = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
for (i = 0; i < p; i++) for (i = 0; i < p; i++)
vbuf += bpl[i] * h / tpg->vdownsampling[i]; vbuf += bpl[i] * h / tpg->vdownsampling[i];
return vbuf; return vbuf;
@ -246,7 +246,7 @@ static void *plane_vaddr(struct tpg_data *tpg, struct vivid_buffer *buf,
static int vivid_copy_buffer(struct vivid_dev *dev, unsigned p, u8 *vcapbuf, static int vivid_copy_buffer(struct vivid_dev *dev, unsigned p, u8 *vcapbuf,
struct vivid_buffer *vid_cap_buf) struct vivid_buffer *vid_cap_buf)
{ {
bool blank = dev->must_blank[vid_cap_buf->vb.v4l2_buf.index]; bool blank = dev->must_blank[vid_cap_buf->vb.vb2_buf.index];
struct tpg_data *tpg = &dev->tpg; struct tpg_data *tpg = &dev->tpg;
struct vivid_buffer *vid_out_buf = NULL; struct vivid_buffer *vid_out_buf = NULL;
unsigned vdiv = dev->fmt_out->vdownsampling[p]; unsigned vdiv = dev->fmt_out->vdownsampling[p];
@ -283,12 +283,12 @@ static int vivid_copy_buffer(struct vivid_dev *dev, unsigned p, u8 *vcapbuf,
if (vid_out_buf == NULL) if (vid_out_buf == NULL)
return -ENODATA; return -ENODATA;
vid_cap_buf->vb.v4l2_buf.field = vid_out_buf->vb.v4l2_buf.field; vid_cap_buf->vb.field = vid_out_buf->vb.field;
voutbuf = plane_vaddr(tpg, vid_out_buf, p, voutbuf = plane_vaddr(tpg, vid_out_buf, p,
dev->bytesperline_out, dev->fmt_out_rect.height); dev->bytesperline_out, dev->fmt_out_rect.height);
if (p < dev->fmt_out->buffers) if (p < dev->fmt_out->buffers)
voutbuf += vid_out_buf->vb.v4l2_planes[p].data_offset; voutbuf += vid_out_buf->vb.vb2_buf.planes[p].data_offset;
voutbuf += tpg_hdiv(tpg, p, dev->loop_vid_out.left) + voutbuf += tpg_hdiv(tpg, p, dev->loop_vid_out.left) +
(dev->loop_vid_out.top / vdiv) * stride_out; (dev->loop_vid_out.top / vdiv) * stride_out;
vcapbuf += tpg_hdiv(tpg, p, dev->compose_cap.left) + vcapbuf += tpg_hdiv(tpg, p, dev->compose_cap.left) +
@ -429,17 +429,19 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf)
bool is_loop = false; bool is_loop = false;
if (dev->loop_video && dev->can_loop_video && if (dev->loop_video && dev->can_loop_video &&
((vivid_is_svid_cap(dev) && !VIVID_INVALID_SIGNAL(dev->std_signal_mode)) || ((vivid_is_svid_cap(dev) &&
(vivid_is_hdmi_cap(dev) && !VIVID_INVALID_SIGNAL(dev->dv_timings_signal_mode)))) !VIVID_INVALID_SIGNAL(dev->std_signal_mode)) ||
(vivid_is_hdmi_cap(dev) &&
!VIVID_INVALID_SIGNAL(dev->dv_timings_signal_mode))))
is_loop = true; is_loop = true;
buf->vb.v4l2_buf.sequence = dev->vid_cap_seq_count; buf->vb.sequence = dev->vid_cap_seq_count;
/* /*
* Take the timestamp now if the timestamp source is set to * Take the timestamp now if the timestamp source is set to
* "Start of Exposure". * "Start of Exposure".
*/ */
if (dev->tstamp_src_is_soe) if (dev->tstamp_src_is_soe)
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.timestamp);
if (dev->field_cap == V4L2_FIELD_ALTERNATE) { if (dev->field_cap == V4L2_FIELD_ALTERNATE) {
/* /*
* 60 Hz standards start with the bottom field, 50 Hz standards * 60 Hz standards start with the bottom field, 50 Hz standards
@ -447,19 +449,19 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf)
* then the field is TOP for 50 Hz and BOTTOM for 60 Hz * then the field is TOP for 50 Hz and BOTTOM for 60 Hz
* standards. * standards.
*/ */
buf->vb.v4l2_buf.field = ((dev->vid_cap_seq_count & 1) ^ is_60hz) ? buf->vb.field = ((dev->vid_cap_seq_count & 1) ^ is_60hz) ?
V4L2_FIELD_BOTTOM : V4L2_FIELD_TOP; V4L2_FIELD_BOTTOM : V4L2_FIELD_TOP;
/* /*
* The sequence counter counts frames, not fields. So divide * The sequence counter counts frames, not fields. So divide
* by two. * by two.
*/ */
buf->vb.v4l2_buf.sequence /= 2; buf->vb.sequence /= 2;
} else { } else {
buf->vb.v4l2_buf.field = dev->field_cap; buf->vb.field = dev->field_cap;
} }
tpg_s_field(tpg, buf->vb.v4l2_buf.field, tpg_s_field(tpg, buf->vb.field,
dev->field_cap == V4L2_FIELD_ALTERNATE); dev->field_cap == V4L2_FIELD_ALTERNATE);
tpg_s_perc_fill_blank(tpg, dev->must_blank[buf->vb.v4l2_buf.index]); tpg_s_perc_fill_blank(tpg, dev->must_blank[buf->vb.vb2_buf.index]);
vivid_precalc_copy_rects(dev); vivid_precalc_copy_rects(dev);
@ -479,13 +481,16 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf)
} }
tpg_calc_text_basep(tpg, basep, p, vbuf); tpg_calc_text_basep(tpg, basep, p, vbuf);
if (!is_loop || vivid_copy_buffer(dev, p, vbuf, buf)) if (!is_loop || vivid_copy_buffer(dev, p, vbuf, buf))
tpg_fill_plane_buffer(tpg, vivid_get_std_cap(dev), p, vbuf); tpg_fill_plane_buffer(tpg, vivid_get_std_cap(dev),
p, vbuf);
} }
dev->must_blank[buf->vb.v4l2_buf.index] = false; dev->must_blank[buf->vb.vb2_buf.index] = false;
/* Updates stream time, only update at the start of a new frame. */ /* Updates stream time, only update at the start of a new frame. */
if (dev->field_cap != V4L2_FIELD_ALTERNATE || (buf->vb.v4l2_buf.sequence & 1) == 0) if (dev->field_cap != V4L2_FIELD_ALTERNATE ||
dev->ms_vid_cap = jiffies_to_msecs(jiffies - dev->jiffies_vid_cap); (buf->vb.sequence & 1) == 0)
dev->ms_vid_cap =
jiffies_to_msecs(jiffies - dev->jiffies_vid_cap);
ms = dev->ms_vid_cap; ms = dev->ms_vid_cap;
if (dev->osd_mode <= 1) { if (dev->osd_mode <= 1) {
@ -494,9 +499,9 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf)
(ms / (60 * 1000)) % 60, (ms / (60 * 1000)) % 60,
(ms / 1000) % 60, (ms / 1000) % 60,
ms % 1000, ms % 1000,
buf->vb.v4l2_buf.sequence, buf->vb.sequence,
(dev->field_cap == V4L2_FIELD_ALTERNATE) ? (dev->field_cap == V4L2_FIELD_ALTERNATE) ?
(buf->vb.v4l2_buf.field == V4L2_FIELD_TOP ? (buf->vb.field == V4L2_FIELD_TOP ?
" top" : " bottom") : ""); " top" : " bottom") : "");
tpg_gen_text(tpg, basep, line++ * line_height, 16, str); tpg_gen_text(tpg, basep, line++ * line_height, 16, str);
} }
@ -553,8 +558,8 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf)
* the timestamp now. * the timestamp now.
*/ */
if (!dev->tstamp_src_is_soe) if (!dev->tstamp_src_is_soe)
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.timestamp);
buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset; buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
} }
/* /*
@ -600,7 +605,7 @@ static void vivid_overlay(struct vivid_dev *dev, struct vivid_buffer *buf)
struct tpg_data *tpg = &dev->tpg; struct tpg_data *tpg = &dev->tpg;
unsigned pixsize = tpg_g_twopixelsize(tpg, 0) / 2; unsigned pixsize = tpg_g_twopixelsize(tpg, 0) / 2;
void *vbase = dev->fb_vbase_cap; void *vbase = dev->fb_vbase_cap;
void *vbuf = vb2_plane_vaddr(&buf->vb, 0); void *vbuf = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
unsigned img_width = dev->compose_cap.width; unsigned img_width = dev->compose_cap.width;
unsigned img_height = dev->compose_cap.height; unsigned img_height = dev->compose_cap.height;
unsigned stride = tpg->bytesperline[0]; unsigned stride = tpg->bytesperline[0];
@ -616,7 +621,7 @@ static void vivid_overlay(struct vivid_dev *dev, struct vivid_buffer *buf)
return; return;
if ((dev->overlay_cap_field == V4L2_FIELD_TOP || if ((dev->overlay_cap_field == V4L2_FIELD_TOP ||
dev->overlay_cap_field == V4L2_FIELD_BOTTOM) && dev->overlay_cap_field == V4L2_FIELD_BOTTOM) &&
dev->overlay_cap_field != buf->vb.v4l2_buf.field) dev->overlay_cap_field != buf->vb.field)
return; return;
vbuf += dev->compose_cap.left * pixsize + dev->compose_cap.top * stride; vbuf += dev->compose_cap.left * pixsize + dev->compose_cap.top * stride;
@ -699,17 +704,17 @@ static void vivid_thread_vid_cap_tick(struct vivid_dev *dev, int dropped_bufs)
/* Fill buffer */ /* Fill buffer */
vivid_fillbuff(dev, vid_cap_buf); vivid_fillbuff(dev, vid_cap_buf);
dprintk(dev, 1, "filled buffer %d\n", dprintk(dev, 1, "filled buffer %d\n",
vid_cap_buf->vb.v4l2_buf.index); vid_cap_buf->vb.vb2_buf.index);
/* Handle overlay */ /* Handle overlay */
if (dev->overlay_cap_owner && dev->fb_cap.base && if (dev->overlay_cap_owner && dev->fb_cap.base &&
dev->fb_cap.fmt.pixelformat == dev->fmt_cap->fourcc) dev->fb_cap.fmt.pixelformat == dev->fmt_cap->fourcc)
vivid_overlay(dev, vid_cap_buf); vivid_overlay(dev, vid_cap_buf);
vb2_buffer_done(&vid_cap_buf->vb, dev->dqbuf_error ? vb2_buffer_done(&vid_cap_buf->vb.vb2_buf, dev->dqbuf_error ?
VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
dprintk(dev, 2, "vid_cap buffer %d done\n", dprintk(dev, 2, "vid_cap buffer %d done\n",
vid_cap_buf->vb.v4l2_buf.index); vid_cap_buf->vb.vb2_buf.index);
} }
if (vbi_cap_buf) { if (vbi_cap_buf) {
@ -717,10 +722,10 @@ static void vivid_thread_vid_cap_tick(struct vivid_dev *dev, int dropped_bufs)
vivid_sliced_vbi_cap_process(dev, vbi_cap_buf); vivid_sliced_vbi_cap_process(dev, vbi_cap_buf);
else else
vivid_raw_vbi_cap_process(dev, vbi_cap_buf); vivid_raw_vbi_cap_process(dev, vbi_cap_buf);
vb2_buffer_done(&vbi_cap_buf->vb, dev->dqbuf_error ? vb2_buffer_done(&vbi_cap_buf->vb.vb2_buf, dev->dqbuf_error ?
VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
dprintk(dev, 2, "vbi_cap %d done\n", dprintk(dev, 2, "vbi_cap %d done\n",
vbi_cap_buf->vb.v4l2_buf.index); vbi_cap_buf->vb.vb2_buf.index);
} }
dev->dqbuf_error = false; dev->dqbuf_error = false;
@ -884,9 +889,9 @@ void vivid_stop_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming)
buf = list_entry(dev->vid_cap_active.next, buf = list_entry(dev->vid_cap_active.next,
struct vivid_buffer, list); struct vivid_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
dprintk(dev, 2, "vid_cap buffer %d done\n", dprintk(dev, 2, "vid_cap buffer %d done\n",
buf->vb.v4l2_buf.index); buf->vb.vb2_buf.index);
} }
} }
@ -897,9 +902,9 @@ void vivid_stop_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming)
buf = list_entry(dev->vbi_cap_active.next, buf = list_entry(dev->vbi_cap_active.next,
struct vivid_buffer, list); struct vivid_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
dprintk(dev, 2, "vbi_cap buffer %d done\n", dprintk(dev, 2, "vbi_cap buffer %d done\n",
buf->vb.v4l2_buf.index); buf->vb.vb2_buf.index);
} }
} }

34
drivers/media/platform/vivid/vivid-kthread-out.c
View File

@ -87,33 +87,33 @@ static void vivid_thread_vid_out_tick(struct vivid_dev *dev)
return; return;
if (vid_out_buf) { if (vid_out_buf) {
vid_out_buf->vb.v4l2_buf.sequence = dev->vid_out_seq_count; vid_out_buf->vb.sequence = dev->vid_out_seq_count;
if (dev->field_out == V4L2_FIELD_ALTERNATE) { if (dev->field_out == V4L2_FIELD_ALTERNATE) {
/* /*
* The sequence counter counts frames, not fields. So divide * The sequence counter counts frames, not fields.
* by two. * So divide by two.
*/ */
vid_out_buf->vb.v4l2_buf.sequence /= 2; vid_out_buf->vb.sequence /= 2;
} }
v4l2_get_timestamp(&vid_out_buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&vid_out_buf->vb.timestamp);
vid_out_buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset; vid_out_buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
vb2_buffer_done(&vid_out_buf->vb, dev->dqbuf_error ? vb2_buffer_done(&vid_out_buf->vb.vb2_buf, dev->dqbuf_error ?
VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
dprintk(dev, 2, "vid_out buffer %d done\n", dprintk(dev, 2, "vid_out buffer %d done\n",
vid_out_buf->vb.v4l2_buf.index); vid_out_buf->vb.vb2_buf.index);
} }
if (vbi_out_buf) { if (vbi_out_buf) {
if (dev->stream_sliced_vbi_out) if (dev->stream_sliced_vbi_out)
vivid_sliced_vbi_out_process(dev, vbi_out_buf); vivid_sliced_vbi_out_process(dev, vbi_out_buf);
vbi_out_buf->vb.v4l2_buf.sequence = dev->vbi_out_seq_count; vbi_out_buf->vb.sequence = dev->vbi_out_seq_count;
v4l2_get_timestamp(&vbi_out_buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&vbi_out_buf->vb.timestamp);
vbi_out_buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset; vbi_out_buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
vb2_buffer_done(&vbi_out_buf->vb, dev->dqbuf_error ? vb2_buffer_done(&vbi_out_buf->vb.vb2_buf, dev->dqbuf_error ?
VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
dprintk(dev, 2, "vbi_out buffer %d done\n", dprintk(dev, 2, "vbi_out buffer %d done\n",
vbi_out_buf->vb.v4l2_buf.index); vbi_out_buf->vb.vb2_buf.index);
} }
dev->dqbuf_error = false; dev->dqbuf_error = false;
} }
@ -274,9 +274,9 @@ void vivid_stop_generating_vid_out(struct vivid_dev *dev, bool *pstreaming)
buf = list_entry(dev->vid_out_active.next, buf = list_entry(dev->vid_out_active.next,
struct vivid_buffer, list); struct vivid_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
dprintk(dev, 2, "vid_out buffer %d done\n", dprintk(dev, 2, "vid_out buffer %d done\n",
buf->vb.v4l2_buf.index); buf->vb.vb2_buf.index);
} }
} }
@ -287,9 +287,9 @@ void vivid_stop_generating_vid_out(struct vivid_dev *dev, bool *pstreaming)
buf = list_entry(dev->vbi_out_active.next, buf = list_entry(dev->vbi_out_active.next,
struct vivid_buffer, list); struct vivid_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
dprintk(dev, 2, "vbi_out buffer %d done\n", dprintk(dev, 2, "vbi_out buffer %d done\n",
buf->vb.v4l2_buf.index); buf->vb.vb2_buf.index);
} }
} }

44
drivers/media/platform/vivid/vivid-sdr-cap.c
View File

@ -115,11 +115,11 @@ static void vivid_thread_sdr_cap_tick(struct vivid_dev *dev)
spin_unlock(&dev->slock); spin_unlock(&dev->slock);
if (sdr_cap_buf) { if (sdr_cap_buf) {
sdr_cap_buf->vb.v4l2_buf.sequence = dev->sdr_cap_seq_count; sdr_cap_buf->vb.sequence = dev->sdr_cap_seq_count;
vivid_sdr_cap_process(dev, sdr_cap_buf); vivid_sdr_cap_process(dev, sdr_cap_buf);
v4l2_get_timestamp(&sdr_cap_buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&sdr_cap_buf->vb.timestamp);
sdr_cap_buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset; sdr_cap_buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
vb2_buffer_done(&sdr_cap_buf->vb, dev->dqbuf_error ? vb2_buffer_done(&sdr_cap_buf->vb.vb2_buf, dev->dqbuf_error ?
VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
dev->dqbuf_error = false; dev->dqbuf_error = false;
} }
@ -162,7 +162,8 @@ static int vivid_thread_sdr_cap(void *data)
/* Calculate the number of jiffies since we started streaming */ /* Calculate the number of jiffies since we started streaming */
jiffies_since_start = cur_jiffies - dev->jiffies_sdr_cap; jiffies_since_start = cur_jiffies - dev->jiffies_sdr_cap;
/* Get the number of buffers streamed since the start */ /* Get the number of buffers streamed since the start */
buffers_since_start = (u64)jiffies_since_start * dev->sdr_adc_freq + buffers_since_start =
(u64)jiffies_since_start * dev->sdr_adc_freq +
(HZ * SDR_CAP_SAMPLES_PER_BUF) / 2; (HZ * SDR_CAP_SAMPLES_PER_BUF) / 2;
do_div(buffers_since_start, HZ * SDR_CAP_SAMPLES_PER_BUF); do_div(buffers_since_start, HZ * SDR_CAP_SAMPLES_PER_BUF);
@ -177,7 +178,8 @@ static int vivid_thread_sdr_cap(void *data)
dev->sdr_cap_seq_offset = buffers_since_start; dev->sdr_cap_seq_offset = buffers_since_start;
buffers_since_start = 0; buffers_since_start = 0;
} }
dev->sdr_cap_seq_count = buffers_since_start + dev->sdr_cap_seq_offset; dev->sdr_cap_seq_count =
buffers_since_start + dev->sdr_cap_seq_offset;
vivid_thread_sdr_cap_tick(dev); vivid_thread_sdr_cap_tick(dev);
mutex_unlock(&dev->mutex); mutex_unlock(&dev->mutex);
@ -248,8 +250,9 @@ static int sdr_cap_buf_prepare(struct vb2_buffer *vb)
static void sdr_cap_buf_queue(struct vb2_buffer *vb) static void sdr_cap_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue); struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
struct vivid_buffer *buf = container_of(vb, struct vivid_buffer, vb); struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb);
dprintk(dev, 1, "%s\n", __func__); dprintk(dev, 1, "%s\n", __func__);
@ -283,7 +286,8 @@ static int sdr_cap_start_streaming(struct vb2_queue *vq, unsigned count)
list_for_each_entry_safe(buf, tmp, &dev->sdr_cap_active, list) { list_for_each_entry_safe(buf, tmp, &dev->sdr_cap_active, list) {
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf,
VB2_BUF_STATE_QUEUED);
} }
} }
return err; return err;
@ -300,9 +304,10 @@ static void sdr_cap_stop_streaming(struct vb2_queue *vq)
while (!list_empty(&dev->sdr_cap_active)) { while (!list_empty(&dev->sdr_cap_active)) {
struct vivid_buffer *buf; struct vivid_buffer *buf;
buf = list_entry(dev->sdr_cap_active.next, struct vivid_buffer, list); buf = list_entry(dev->sdr_cap_active.next,
struct vivid_buffer, list);
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
} }
/* shutdown control thread */ /* shutdown control thread */
@ -322,7 +327,8 @@ const struct vb2_ops vivid_sdr_cap_qops = {
.wait_finish = vb2_ops_wait_finish, .wait_finish = vb2_ops_wait_finish,
}; };
int vivid_sdr_enum_freq_bands(struct file *file, void *fh, struct v4l2_frequency_band *band) int vivid_sdr_enum_freq_bands(struct file *file, void *fh,
struct v4l2_frequency_band *band)
{ {
switch (band->tuner) { switch (band->tuner) {
case 0: case 0:
@ -340,7 +346,8 @@ int vivid_sdr_enum_freq_bands(struct file *file, void *fh, struct v4l2_frequency
} }
} }
int vivid_sdr_g_frequency(struct file *file, void *fh, struct v4l2_frequency *vf) int vivid_sdr_g_frequency(struct file *file, void *fh,
struct v4l2_frequency *vf)
{ {
struct vivid_dev *dev = video_drvdata(file); struct vivid_dev *dev = video_drvdata(file);
@ -358,7 +365,8 @@ int vivid_sdr_g_frequency(struct file *file, void *fh, struct v4l2_frequency *vf
} }
} }
int vivid_sdr_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf) int vivid_sdr_s_frequency(struct file *file, void *fh,
const struct v4l2_frequency *vf)
{ {
struct vivid_dev *dev = video_drvdata(file); struct vivid_dev *dev = video_drvdata(file);
unsigned freq = vf->frequency; unsigned freq = vf->frequency;
@ -404,14 +412,16 @@ int vivid_sdr_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt)
case 0: case 0:
strlcpy(vt->name, "ADC", sizeof(vt->name)); strlcpy(vt->name, "ADC", sizeof(vt->name));
vt->type = V4L2_TUNER_ADC; vt->type = V4L2_TUNER_ADC;
vt->capability = V4L2_TUNER_CAP_1HZ | V4L2_TUNER_CAP_FREQ_BANDS; vt->capability =
V4L2_TUNER_CAP_1HZ | V4L2_TUNER_CAP_FREQ_BANDS;
vt->rangelow = bands_adc[0].rangelow; vt->rangelow = bands_adc[0].rangelow;
vt->rangehigh = bands_adc[2].rangehigh; vt->rangehigh = bands_adc[2].rangehigh;
return 0; return 0;
case 1: case 1:
strlcpy(vt->name, "RF", sizeof(vt->name)); strlcpy(vt->name, "RF", sizeof(vt->name));
vt->type = V4L2_TUNER_RF; vt->type = V4L2_TUNER_RF;
vt->capability = V4L2_TUNER_CAP_1HZ | V4L2_TUNER_CAP_FREQ_BANDS; vt->capability =
V4L2_TUNER_CAP_1HZ | V4L2_TUNER_CAP_FREQ_BANDS;
vt->rangelow = bands_fm[0].rangelow; vt->rangelow = bands_fm[0].rangelow;
vt->rangehigh = bands_fm[0].rangehigh; vt->rangehigh = bands_fm[0].rangehigh;
return 0; return 0;
@ -493,9 +503,9 @@ int vidioc_try_fmt_sdr_cap(struct file *file, void *fh, struct v4l2_format *f)
void vivid_sdr_cap_process(struct vivid_dev *dev, struct vivid_buffer *buf) void vivid_sdr_cap_process(struct vivid_dev *dev, struct vivid_buffer *buf)
{ {
u8 *vbuf = vb2_plane_vaddr(&buf->vb, 0); u8 *vbuf = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
unsigned long i; unsigned long i;
unsigned long plane_size = vb2_plane_size(&buf->vb, 0); unsigned long plane_size = vb2_plane_size(&buf->vb.vb2_buf, 0);
s64 s64tmp; s64 s64tmp;
s32 src_phase_step; s32 src_phase_step;
s32 mod_phase_step; s32 mod_phase_step;

45
drivers/media/platform/vivid/vivid-vbi-cap.c
View File

@ -94,36 +94,38 @@ static void vivid_g_fmt_vbi_cap(struct vivid_dev *dev, struct v4l2_vbi_format *v
void vivid_raw_vbi_cap_process(struct vivid_dev *dev, struct vivid_buffer *buf) void vivid_raw_vbi_cap_process(struct vivid_dev *dev, struct vivid_buffer *buf)
{ {
struct v4l2_vbi_format vbi; struct v4l2_vbi_format vbi;
u8 *vbuf = vb2_plane_vaddr(&buf->vb, 0); u8 *vbuf = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
vivid_g_fmt_vbi_cap(dev, &vbi); vivid_g_fmt_vbi_cap(dev, &vbi);
buf->vb.v4l2_buf.sequence = dev->vbi_cap_seq_count; buf->vb.sequence = dev->vbi_cap_seq_count;
if (dev->field_cap == V4L2_FIELD_ALTERNATE) if (dev->field_cap == V4L2_FIELD_ALTERNATE)
buf->vb.v4l2_buf.sequence /= 2; buf->vb.sequence /= 2;
vivid_sliced_vbi_cap_fill(dev, buf->vb.v4l2_buf.sequence); vivid_sliced_vbi_cap_fill(dev, buf->vb.sequence);
memset(vbuf, 0x10, vb2_plane_size(&buf->vb, 0)); memset(vbuf, 0x10, vb2_plane_size(&buf->vb.vb2_buf, 0));
if (!VIVID_INVALID_SIGNAL(dev->std_signal_mode)) if (!VIVID_INVALID_SIGNAL(dev->std_signal_mode))
vivid_vbi_gen_raw(&dev->vbi_gen, &vbi, vbuf); vivid_vbi_gen_raw(&dev->vbi_gen, &vbi, vbuf);
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.timestamp);
buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset; buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
} }
void vivid_sliced_vbi_cap_process(struct vivid_dev *dev, struct vivid_buffer *buf) void vivid_sliced_vbi_cap_process(struct vivid_dev *dev,
struct vivid_buffer *buf)
{ {
struct v4l2_sliced_vbi_data *vbuf = vb2_plane_vaddr(&buf->vb, 0); struct v4l2_sliced_vbi_data *vbuf =
vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
buf->vb.v4l2_buf.sequence = dev->vbi_cap_seq_count; buf->vb.sequence = dev->vbi_cap_seq_count;
if (dev->field_cap == V4L2_FIELD_ALTERNATE) if (dev->field_cap == V4L2_FIELD_ALTERNATE)
buf->vb.v4l2_buf.sequence /= 2; buf->vb.sequence /= 2;
vivid_sliced_vbi_cap_fill(dev, buf->vb.v4l2_buf.sequence); vivid_sliced_vbi_cap_fill(dev, buf->vb.sequence);
memset(vbuf, 0, vb2_plane_size(&buf->vb, 0)); memset(vbuf, 0, vb2_plane_size(&buf->vb.vb2_buf, 0));
if (!VIVID_INVALID_SIGNAL(dev->std_signal_mode)) { if (!VIVID_INVALID_SIGNAL(dev->std_signal_mode)) {
unsigned i; unsigned i;
@ -131,13 +133,14 @@ void vivid_sliced_vbi_cap_process(struct vivid_dev *dev, struct vivid_buffer *bu
vbuf[i] = dev->vbi_gen.data[i]; vbuf[i] = dev->vbi_gen.data[i];
} }
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.timestamp);
buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset; buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
} }
static int vbi_cap_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt, static int vbi_cap_queue_setup(struct vb2_queue *vq,
unsigned *nbuffers, unsigned *nplanes, const struct v4l2_format *fmt,
unsigned sizes[], void *alloc_ctxs[]) unsigned *nbuffers, unsigned *nplanes,
unsigned sizes[], void *alloc_ctxs[])
{ {
struct vivid_dev *dev = vb2_get_drv_priv(vq); struct vivid_dev *dev = vb2_get_drv_priv(vq);
bool is_60hz = dev->std_cap & V4L2_STD_525_60; bool is_60hz = dev->std_cap & V4L2_STD_525_60;
@ -187,8 +190,9 @@ static int vbi_cap_buf_prepare(struct vb2_buffer *vb)
static void vbi_cap_buf_queue(struct vb2_buffer *vb) static void vbi_cap_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue); struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
struct vivid_buffer *buf = container_of(vb, struct vivid_buffer, vb); struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb);
dprintk(dev, 1, "%s\n", __func__); dprintk(dev, 1, "%s\n", __func__);
@ -215,7 +219,8 @@ static int vbi_cap_start_streaming(struct vb2_queue *vq, unsigned count)
list_for_each_entry_safe(buf, tmp, &dev->vbi_cap_active, list) { list_for_each_entry_safe(buf, tmp, &dev->vbi_cap_active, list) {
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf,
VB2_BUF_STATE_QUEUED);
} }
} }
return err; return err;

18
drivers/media/platform/vivid/vivid-vbi-out.c
View File

@ -79,8 +79,9 @@ static int vbi_out_buf_prepare(struct vb2_buffer *vb)
static void vbi_out_buf_queue(struct vb2_buffer *vb) static void vbi_out_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue); struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
struct vivid_buffer *buf = container_of(vb, struct vivid_buffer, vb); struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb);
dprintk(dev, 1, "%s\n", __func__); dprintk(dev, 1, "%s\n", __func__);
@ -107,7 +108,8 @@ static int vbi_out_start_streaming(struct vb2_queue *vq, unsigned count)
list_for_each_entry_safe(buf, tmp, &dev->vbi_out_active, list) { list_for_each_entry_safe(buf, tmp, &dev->vbi_out_active, list) {
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf,
VB2_BUF_STATE_QUEUED);
} }
} }
return err; return err;
@ -201,7 +203,8 @@ int vidioc_try_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_forma
return 0; return 0;
} }
int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_format *fmt) int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh,
struct v4l2_format *fmt)
{ {
struct vivid_dev *dev = video_drvdata(file); struct vivid_dev *dev = video_drvdata(file);
struct v4l2_sliced_vbi_format *vbi = &fmt->fmt.sliced; struct v4l2_sliced_vbi_format *vbi = &fmt->fmt.sliced;
@ -217,10 +220,13 @@ int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_format
return 0; return 0;
} }
void vivid_sliced_vbi_out_process(struct vivid_dev *dev, struct vivid_buffer *buf) void vivid_sliced_vbi_out_process(struct vivid_dev *dev,
struct vivid_buffer *buf)
{ {
struct v4l2_sliced_vbi_data *vbi = vb2_plane_vaddr(&buf->vb, 0); struct v4l2_sliced_vbi_data *vbi =
unsigned elems = vb2_get_plane_payload(&buf->vb, 0) / sizeof(*vbi); vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
unsigned elems =
vb2_get_plane_payload(&buf->vb.vb2_buf, 0) / sizeof(*vbi);
dev->vbi_out_have_cc[0] = false; dev->vbi_out_have_cc[0] = false;
dev->vbi_out_have_cc[1] = false; dev->vbi_out_have_cc[1] = false;

15
drivers/media/platform/vivid/vivid-vid-cap.c
View File

@ -198,7 +198,7 @@ static int vid_cap_buf_prepare(struct vb2_buffer *vb)
} }
vb2_set_plane_payload(vb, p, size); vb2_set_plane_payload(vb, p, size);
vb->v4l2_planes[p].data_offset = dev->fmt_cap->data_offset[p]; vb->planes[p].data_offset = dev->fmt_cap->data_offset[p];
} }
return 0; return 0;
@ -206,10 +206,11 @@ static int vid_cap_buf_prepare(struct vb2_buffer *vb)
static void vid_cap_buf_finish(struct vb2_buffer *vb) static void vid_cap_buf_finish(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue); struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
struct v4l2_timecode *tc = &vb->v4l2_buf.timecode; struct v4l2_timecode *tc = &vbuf->timecode;
unsigned fps = 25; unsigned fps = 25;
unsigned seq = vb->v4l2_buf.sequence; unsigned seq = vbuf->sequence;
if (!vivid_is_sdtv_cap(dev)) if (!vivid_is_sdtv_cap(dev))
return; return;
@ -218,7 +219,7 @@ static void vid_cap_buf_finish(struct vb2_buffer *vb)
* Set the timecode. Rarely used, so it is interesting to * Set the timecode. Rarely used, so it is interesting to
* test this. * test this.
*/ */
vb->v4l2_buf.flags |= V4L2_BUF_FLAG_TIMECODE; vbuf->flags |= V4L2_BUF_FLAG_TIMECODE;
if (dev->std_cap & V4L2_STD_525_60) if (dev->std_cap & V4L2_STD_525_60)
fps = 30; fps = 30;
tc->type = (fps == 30) ? V4L2_TC_TYPE_30FPS : V4L2_TC_TYPE_25FPS; tc->type = (fps == 30) ? V4L2_TC_TYPE_30FPS : V4L2_TC_TYPE_25FPS;
@ -231,8 +232,9 @@ static void vid_cap_buf_finish(struct vb2_buffer *vb)
static void vid_cap_buf_queue(struct vb2_buffer *vb) static void vid_cap_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue); struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
struct vivid_buffer *buf = container_of(vb, struct vivid_buffer, vb); struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb);
dprintk(dev, 1, "%s\n", __func__); dprintk(dev, 1, "%s\n", __func__);
@ -268,7 +270,8 @@ static int vid_cap_start_streaming(struct vb2_queue *vq, unsigned count)
list_for_each_entry_safe(buf, tmp, &dev->vid_cap_active, list) { list_for_each_entry_safe(buf, tmp, &dev->vid_cap_active, list) {
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf,
VB2_BUF_STATE_QUEUED);
} }
} }
return err; return err;

15
drivers/media/platform/vivid/vivid-vid-out.c
View File

@ -109,6 +109,7 @@ static int vid_out_queue_setup(struct vb2_queue *vq, const struct v4l2_format *f
static int vid_out_buf_prepare(struct vb2_buffer *vb) static int vid_out_buf_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue); struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
unsigned long size; unsigned long size;
unsigned planes; unsigned planes;
@ -131,14 +132,14 @@ static int vid_out_buf_prepare(struct vb2_buffer *vb)
} }
if (dev->field_out != V4L2_FIELD_ALTERNATE) if (dev->field_out != V4L2_FIELD_ALTERNATE)
vb->v4l2_buf.field = dev->field_out; vbuf->field = dev->field_out;
else if (vb->v4l2_buf.field != V4L2_FIELD_TOP && else if (vbuf->field != V4L2_FIELD_TOP &&
vb->v4l2_buf.field != V4L2_FIELD_BOTTOM) vbuf->field != V4L2_FIELD_BOTTOM)
return -EINVAL; return -EINVAL;
for (p = 0; p < planes; p++) { for (p = 0; p < planes; p++) {
size = dev->bytesperline_out[p] * dev->fmt_out_rect.height + size = dev->bytesperline_out[p] * dev->fmt_out_rect.height +
vb->v4l2_planes[p].data_offset; vb->planes[p].data_offset;
if (vb2_get_plane_payload(vb, p) < size) { if (vb2_get_plane_payload(vb, p) < size) {
dprintk(dev, 1, "%s the payload is too small for plane %u (%lu < %lu)\n", dprintk(dev, 1, "%s the payload is too small for plane %u (%lu < %lu)\n",
@ -152,8 +153,9 @@ static int vid_out_buf_prepare(struct vb2_buffer *vb)
static void vid_out_buf_queue(struct vb2_buffer *vb) static void vid_out_buf_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue); struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
struct vivid_buffer *buf = container_of(vb, struct vivid_buffer, vb); struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb);
dprintk(dev, 1, "%s\n", __func__); dprintk(dev, 1, "%s\n", __func__);
@ -186,7 +188,8 @@ static int vid_out_start_streaming(struct vb2_queue *vq, unsigned count)
list_for_each_entry_safe(buf, tmp, &dev->vid_out_active, list) { list_for_each_entry_safe(buf, tmp, &dev->vid_out_active, list) {
list_del(&buf->list); list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf,
VB2_BUF_STATE_QUEUED);
} }
} }
return err; return err;

4
drivers/media/platform/vsp1/vsp1_rpf.c
View File

@ -200,10 +200,10 @@ static void rpf_vdev_queue(struct vsp1_video *video,
vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_Y, vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_Y,
buf->addr[0] + rpf->offsets[0]); buf->addr[0] + rpf->offsets[0]);
if (buf->buf.num_planes > 1) if (buf->buf.vb2_buf.num_planes > 1)
vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_C0, vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_C0,
buf->addr[1] + rpf->offsets[1]); buf->addr[1] + rpf->offsets[1]);
if (buf->buf.num_planes > 2) if (buf->buf.vb2_buf.num_planes > 2)
vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_C1, vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_C1,
buf->addr[2] + rpf->offsets[1]); buf->addr[2] + rpf->offsets[1]);
} }

18
drivers/media/platform/vsp1/vsp1_video.c
View File

@ -610,11 +610,11 @@ vsp1_video_complete_buffer(struct vsp1_video *video)
spin_unlock_irqrestore(&video->irqlock, flags); spin_unlock_irqrestore(&video->irqlock, flags);
done->buf.v4l2_buf.sequence = video->sequence++; done->buf.sequence = video->sequence++;
v4l2_get_timestamp(&done->buf.v4l2_buf.timestamp); v4l2_get_timestamp(&done->buf.timestamp);
for (i = 0; i < done->buf.num_planes; ++i) for (i = 0; i < done->buf.vb2_buf.num_planes; ++i)
vb2_set_plane_payload(&done->buf, i, done->length[i]); vb2_set_plane_payload(&done->buf.vb2_buf, i, done->length[i]);
vb2_buffer_done(&done->buf, VB2_BUF_STATE_DONE); vb2_buffer_done(&done->buf.vb2_buf, VB2_BUF_STATE_DONE);
return next; return next;
} }
@ -820,8 +820,9 @@ vsp1_video_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
static int vsp1_video_buffer_prepare(struct vb2_buffer *vb) static int vsp1_video_buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vsp1_video *video = vb2_get_drv_priv(vb->vb2_queue); struct vsp1_video *video = vb2_get_drv_priv(vb->vb2_queue);
struct vsp1_video_buffer *buf = to_vsp1_video_buffer(vb); struct vsp1_video_buffer *buf = to_vsp1_video_buffer(vbuf);
const struct v4l2_pix_format_mplane *format = &video->format; const struct v4l2_pix_format_mplane *format = &video->format;
unsigned int i; unsigned int i;
@ -841,9 +842,10 @@ static int vsp1_video_buffer_prepare(struct vb2_buffer *vb)
static void vsp1_video_buffer_queue(struct vb2_buffer *vb) static void vsp1_video_buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vsp1_video *video = vb2_get_drv_priv(vb->vb2_queue); struct vsp1_video *video = vb2_get_drv_priv(vb->vb2_queue);
struct vsp1_pipeline *pipe = to_vsp1_pipeline(&video->video.entity); struct vsp1_pipeline *pipe = to_vsp1_pipeline(&video->video.entity);
struct vsp1_video_buffer *buf = to_vsp1_video_buffer(vb); struct vsp1_video_buffer *buf = to_vsp1_video_buffer(vbuf);
unsigned long flags; unsigned long flags;
bool empty; bool empty;
@ -954,7 +956,7 @@ static void vsp1_video_stop_streaming(struct vb2_queue *vq)
/* Remove all buffers from the IRQ queue. */ /* Remove all buffers from the IRQ queue. */
spin_lock_irqsave(&video->irqlock, flags); spin_lock_irqsave(&video->irqlock, flags);
list_for_each_entry(buffer, &video->irqqueue, queue) list_for_each_entry(buffer, &video->irqqueue, queue)
vb2_buffer_done(&buffer->buf, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buffer->buf.vb2_buf, VB2_BUF_STATE_ERROR);
INIT_LIST_HEAD(&video->irqqueue); INIT_LIST_HEAD(&video->irqqueue);
spin_unlock_irqrestore(&video->irqlock, flags); spin_unlock_irqrestore(&video->irqlock, flags);
} }

6
drivers/media/platform/vsp1/vsp1_video.h
View File

@ -94,7 +94,7 @@ static inline struct vsp1_pipeline *to_vsp1_pipeline(struct media_entity *e)
} }
struct vsp1_video_buffer { struct vsp1_video_buffer {
struct vb2_buffer buf; struct vb2_v4l2_buffer buf;
struct list_head queue; struct list_head queue;
dma_addr_t addr[3]; dma_addr_t addr[3];
@ -102,9 +102,9 @@ struct vsp1_video_buffer {
}; };
static inline struct vsp1_video_buffer * static inline struct vsp1_video_buffer *
to_vsp1_video_buffer(struct vb2_buffer *vb) to_vsp1_video_buffer(struct vb2_v4l2_buffer *vbuf)
{ {
return container_of(vb, struct vsp1_video_buffer, buf); return container_of(vbuf, struct vsp1_video_buffer, buf);
} }
struct vsp1_video_operations { struct vsp1_video_operations {

4
drivers/media/platform/vsp1/vsp1_wpf.c
View File

@ -201,9 +201,9 @@ static void wpf_vdev_queue(struct vsp1_video *video,
struct vsp1_rwpf *wpf = container_of(video, struct vsp1_rwpf, video); struct vsp1_rwpf *wpf = container_of(video, struct vsp1_rwpf, video);
vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_Y, buf->addr[0]); vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_Y, buf->addr[0]);
if (buf->buf.num_planes > 1) if (buf->buf.vb2_buf.num_planes > 1)
vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_C0, buf->addr[1]); vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_C0, buf->addr[1]);
if (buf->buf.num_planes > 2) if (buf->buf.vb2_buf.num_planes > 2)
vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_C1, buf->addr[2]); vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_C1, buf->addr[2]);
} }

24
drivers/media/platform/xilinx/xilinx-dma.c
View File

@ -285,7 +285,7 @@ done:
* @dma: DMA channel that uses the buffer * @dma: DMA channel that uses the buffer
*/ */
struct xvip_dma_buffer { struct xvip_dma_buffer {
struct vb2_buffer buf; struct vb2_v4l2_buffer buf;
struct list_head queue; struct list_head queue;
struct xvip_dma *dma; struct xvip_dma *dma;
}; };
@ -301,11 +301,11 @@ static void xvip_dma_complete(void *param)
list_del(&buf->queue); list_del(&buf->queue);
spin_unlock(&dma->queued_lock); spin_unlock(&dma->queued_lock);
buf->buf.v4l2_buf.field = V4L2_FIELD_NONE; buf->buf.field = V4L2_FIELD_NONE;
buf->buf.v4l2_buf.sequence = dma->sequence++; buf->buf.sequence = dma->sequence++;
v4l2_get_timestamp(&buf->buf.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->buf.timestamp);
vb2_set_plane_payload(&buf->buf, 0, dma->format.sizeimage); vb2_set_plane_payload(&buf->buf.vb2_buf, 0, dma->format.sizeimage);
vb2_buffer_done(&buf->buf, VB2_BUF_STATE_DONE); vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_DONE);
} }
static int static int
@ -329,8 +329,9 @@ xvip_dma_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
static int xvip_dma_buffer_prepare(struct vb2_buffer *vb) static int xvip_dma_buffer_prepare(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct xvip_dma *dma = vb2_get_drv_priv(vb->vb2_queue); struct xvip_dma *dma = vb2_get_drv_priv(vb->vb2_queue);
struct xvip_dma_buffer *buf = to_xvip_dma_buffer(vb); struct xvip_dma_buffer *buf = to_xvip_dma_buffer(vbuf);
buf->dma = dma; buf->dma = dma;
@ -339,8 +340,9 @@ static int xvip_dma_buffer_prepare(struct vb2_buffer *vb)
static void xvip_dma_buffer_queue(struct vb2_buffer *vb) static void xvip_dma_buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct xvip_dma *dma = vb2_get_drv_priv(vb->vb2_queue); struct xvip_dma *dma = vb2_get_drv_priv(vb->vb2_queue);
struct xvip_dma_buffer *buf = to_xvip_dma_buffer(vb); struct xvip_dma_buffer *buf = to_xvip_dma_buffer(vbuf);
struct dma_async_tx_descriptor *desc; struct dma_async_tx_descriptor *desc;
dma_addr_t addr = vb2_dma_contig_plane_dma_addr(vb, 0); dma_addr_t addr = vb2_dma_contig_plane_dma_addr(vb, 0);
u32 flags; u32 flags;
@ -367,7 +369,7 @@ static void xvip_dma_buffer_queue(struct vb2_buffer *vb)
desc = dmaengine_prep_interleaved_dma(dma->dma, &dma->xt, flags); desc = dmaengine_prep_interleaved_dma(dma->dma, &dma->xt, flags);
if (!desc) { if (!desc) {
dev_err(dma->xdev->dev, "Failed to prepare DMA transfer\n"); dev_err(dma->xdev->dev, "Failed to prepare DMA transfer\n");
vb2_buffer_done(&buf->buf, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_ERROR);
return; return;
} }
desc->callback = xvip_dma_complete; desc->callback = xvip_dma_complete;
@ -434,7 +436,7 @@ error:
/* Give back all queued buffers to videobuf2. */ /* Give back all queued buffers to videobuf2. */
spin_lock_irq(&dma->queued_lock); spin_lock_irq(&dma->queued_lock);
list_for_each_entry_safe(buf, nbuf, &dma->queued_bufs, queue) { list_for_each_entry_safe(buf, nbuf, &dma->queued_bufs, queue) {
vb2_buffer_done(&buf->buf, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_QUEUED);
list_del(&buf->queue); list_del(&buf->queue);
} }
spin_unlock_irq(&dma->queued_lock); spin_unlock_irq(&dma->queued_lock);
@ -461,7 +463,7 @@ static void xvip_dma_stop_streaming(struct vb2_queue *vq)
/* Give back all queued buffers to videobuf2. */ /* Give back all queued buffers to videobuf2. */
spin_lock_irq(&dma->queued_lock); spin_lock_irq(&dma->queued_lock);
list_for_each_entry_safe(buf, nbuf, &dma->queued_bufs, queue) { list_for_each_entry_safe(buf, nbuf, &dma->queued_bufs, queue) {
vb2_buffer_done(&buf->buf, VB2_BUF_STATE_ERROR); vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_ERROR);
list_del(&buf->queue); list_del(&buf->queue);
} }
spin_unlock_irq(&dma->queued_lock); spin_unlock_irq(&dma->queued_lock);

Some files were not shown because too many files have changed in this diff Show More