Merge tag 'media/v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: "Media updates, including: - Lots of improvements at the kABI documentation - Split of Videobuf2 into a common part and a V4L2 specific one - Split of the VB2 tracing events into a separate header file - s5p-mfc got support for Exynos 5433 - v4l2 fixes for 64-bits alignment when running 32 bits userspace on ARM - Added support for SDR radio transmitter at core, vivid and hackrf drivers - Some y2038 fixups - Some improvements at V4L2 colorspace support - saa7164 converted to use the V4L2 core control framework - several new boards additions, cleanups and fixups PS: There are two patches for scripts/kernel-doc that are needed by the documentation patches on Media. Jon is OK on merging those via my tree" * tag 'media/v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (146 commits) [media] c8sectpfe: Remove select on CONFIG_FW_LOADER_USER_HELPER_FALLBACK [media] DocBook media: update copyright/version numbers [media] ivtv: Convert to get_user_pages_unlocked() [media] media/v4l2-ctrls: fix setting autocluster to manual with VIDIOC_S_CTRL [media] DocBook media: Fix a typo in encoder cmd [media] DocBook: add SDR specific info to G_MODULATOR / S_MODULATOR [media] DocBook: add SDR specific info to G_TUNER / S_TUNER [media] hackrf: do not set human readable name for formats [media] hackrf: add support for transmitter [media] hackrf: switch to single function which configures everything [media] hackrf: add control for RF amplifier [media] DocBook: add modulator type field [media] v4l: add type field to v4l2_modulator struct [media] DocBook: document SDR transmitter [media] v4l2: add support for SDR transmitter [media] DocBook: document tuner RF gain control [media] v4l2: add RF gain control [media] v4l2: rename V4L2_TUNER_ADC to V4L2_TUNER_SDR [media] media/vivid-osd: fix info leak in ioctl [media] media: videobuf2: Move v4l2-specific stuff to videobuf2-v4l2 ...
This commit is contained in:
@@ -3625,13 +3625,10 @@ static void
|
||||
bttv_irq_wakeup_vbi(struct bttv *btv, struct bttv_buffer *wakeup,
|
||||
unsigned int state)
|
||||
{
|
||||
struct timeval ts;
|
||||
|
||||
if (NULL == wakeup)
|
||||
return;
|
||||
|
||||
v4l2_get_timestamp(&ts);
|
||||
wakeup->vb.ts = ts;
|
||||
v4l2_get_timestamp(&wakeup->vb.ts);
|
||||
wakeup->vb.field_count = btv->field_count;
|
||||
wakeup->vb.state = state;
|
||||
wake_up(&wakeup->vb.done);
|
||||
|
@@ -1,6 +1,6 @@
|
||||
config VIDEO_COBALT
|
||||
tristate "Cisco Cobalt support"
|
||||
depends on VIDEO_V4L2 && I2C && MEDIA_CONTROLLER
|
||||
depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
|
||||
depends on PCI_MSI && MTD_COMPLEX_MAPPINGS
|
||||
depends on GPIOLIB || COMPILE_TEST
|
||||
depends on SND
|
||||
|
@@ -290,8 +290,8 @@ bool cobalt_cpld_set_freq(struct cobalt *cobalt, unsigned f_out)
|
||||
0x01, 0xc7, 0xfc, 0x7f, 0x53, 0x62).
|
||||
*/
|
||||
|
||||
cobalt_dbg(1, "%u: %02x %02x %02x %02x %02x %02x\n", f_out,
|
||||
regs[0], regs[1], regs[2], regs[3], regs[4], regs[5]);
|
||||
cobalt_dbg(1, "%u: %6ph\n", f_out, regs);
|
||||
|
||||
while (retries--) {
|
||||
u8 read_regs[6];
|
||||
|
||||
@@ -330,9 +330,7 @@ bool cobalt_cpld_set_freq(struct cobalt *cobalt, unsigned f_out)
|
||||
|
||||
if (!memcmp(read_regs, regs, sizeof(read_regs)))
|
||||
break;
|
||||
cobalt_dbg(1, "retry: %02x %02x %02x %02x %02x %02x\n",
|
||||
read_regs[0], read_regs[1], read_regs[2],
|
||||
read_regs[3], read_regs[4], read_regs[5]);
|
||||
cobalt_dbg(1, "retry: %6ph\n", read_regs);
|
||||
}
|
||||
if (2 - retries)
|
||||
cobalt_info("Needed %d retries\n", 2 - retries);
|
||||
|
@@ -35,6 +35,7 @@
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-sg.h>
|
||||
|
||||
#include "m00233_video_measure_memmap_package.h"
|
||||
@@ -206,11 +207,12 @@ struct sg_dma_desc_info {
|
||||
#define COBALT_STREAM_FL_ADV_IRQ 1
|
||||
|
||||
struct cobalt_buffer {
|
||||
struct vb2_buffer vb;
|
||||
struct vb2_v4l2_buffer vb;
|
||||
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);
|
||||
}
|
||||
|
@@ -134,11 +134,12 @@ done:
|
||||
skip = true;
|
||||
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
|
||||
also know about dropped frames. */
|
||||
cb->vb.v4l2_buf.sequence = s->sequence++;
|
||||
vb2_buffer_done(&cb->vb, (skip || s->unstable_frame) ?
|
||||
cb->vb.sequence = s->sequence++;
|
||||
vb2_buffer_done(&cb->vb.vb2_buf,
|
||||
(skip || s->unstable_frame) ?
|
||||
VB2_BUF_STATE_REQUEUEING : VB2_BUF_STATE_DONE);
|
||||
}
|
||||
|
||||
|
@@ -43,11 +43,11 @@ static const struct v4l2_dv_timings cea1080p60 = V4L2_DV_BT_CEA_1920X1080P60;
|
||||
|
||||
/* vb2 DMA streaming ops */
|
||||
|
||||
static int cobalt_queue_setup(struct vb2_queue *q,
|
||||
const struct v4l2_format *fmt,
|
||||
static int cobalt_queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
const struct v4l2_format *fmt = parg;
|
||||
struct cobalt_stream *s = q->drv_priv;
|
||||
unsigned size = s->stride * s->height;
|
||||
|
||||
@@ -75,7 +75,7 @@ static int cobalt_buf_init(struct vb2_buffer *vb)
|
||||
const size_t bytes =
|
||||
COBALT_MAX_HEIGHT * max_pages_per_line * 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);
|
||||
unsigned size;
|
||||
int ret;
|
||||
@@ -105,17 +105,18 @@ static int cobalt_buf_init(struct vb2_buffer *vb)
|
||||
static void cobalt_buf_cleanup(struct vb2_buffer *vb)
|
||||
{
|
||||
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);
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
vb2_set_plane_payload(vb, 0, s->stride * s->height);
|
||||
vb->v4l2_buf.field = V4L2_FIELD_NONE;
|
||||
vbuf->field = V4L2_FIELD_NONE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -128,7 +129,7 @@ static void chain_all_buffers(struct cobalt_stream *s)
|
||||
|
||||
list_for_each(p, &s->bufs) {
|
||||
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)
|
||||
descriptor_list_chain(desc[i-1], desc[i]);
|
||||
i++;
|
||||
@@ -137,10 +138,11 @@ static void chain_all_buffers(struct cobalt_stream *s)
|
||||
|
||||
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 cobalt_stream *s = q->drv_priv;
|
||||
struct cobalt_buffer *cb = to_cobalt_buffer(vb);
|
||||
struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->v4l2_buf.index];
|
||||
struct cobalt_buffer *cb = to_cobalt_buffer(vbuf);
|
||||
struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->index];
|
||||
unsigned long flags;
|
||||
|
||||
/* Prepare new buffer */
|
||||
@@ -284,7 +286,7 @@ static void cobalt_dma_start_streaming(struct cobalt_stream *s)
|
||||
&vo->control);
|
||||
}
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -381,7 +383,7 @@ static void cobalt_dma_stop_streaming(struct cobalt_stream *s)
|
||||
spin_lock_irqsave(&s->irqlock, flags);
|
||||
list_for_each(p, &s->bufs) {
|
||||
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 */
|
||||
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) {
|
||||
cb = list_entry(p, struct cobalt_buffer, 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);
|
||||
|
||||
|
@@ -202,7 +202,7 @@ static void cx18_mdl_send_to_videobuf(struct cx18_stream *s,
|
||||
}
|
||||
|
||||
if (dispatch) {
|
||||
vb_buf->vb.ts = ktime_to_timeval(ktime_get());
|
||||
v4l2_get_timestamp(&vb_buf->vb.ts);
|
||||
list_del(&vb_buf->vb.queue);
|
||||
vb_buf->vb.state = VIDEOBUF_DONE;
|
||||
wake_up(&vb_buf->vb.done);
|
||||
|
@@ -1138,7 +1138,7 @@ static int cx23885_initialize_codec(struct cx23885_dev *dev, int startencoder)
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
|
||||
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);
|
||||
}
|
||||
|
||||
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_buffer *buf = container_of(vb,
|
||||
struct cx23885_buffer *buf = container_of(vbuf,
|
||||
struct cx23885_buffer, vb);
|
||||
|
||||
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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
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);
|
||||
|
||||
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);
|
||||
|
||||
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);
|
||||
return ret;
|
||||
|
@@ -427,12 +427,13 @@ static void cx23885_wakeup(struct cx23885_tsport *port,
|
||||
buf = list_entry(q->active.next,
|
||||
struct cx23885_buffer, queue);
|
||||
|
||||
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
|
||||
buf->vb.v4l2_buf.sequence = q->count++;
|
||||
dprintk(1, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.v4l2_buf.index,
|
||||
v4l2_get_timestamp(&buf->vb.timestamp);
|
||||
buf->vb.sequence = q->count++;
|
||||
dprintk(1, "[%p/%d] wakeup reg=%d buf=%d\n", buf,
|
||||
buf->vb.vb2_buf.index,
|
||||
count, q->count);
|
||||
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,
|
||||
@@ -1453,12 +1454,12 @@ int cx23885_buf_prepare(struct cx23885_buffer *buf, struct cx23885_tsport *port)
|
||||
{
|
||||
struct cx23885_dev *dev = port->dev;
|
||||
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);
|
||||
if (vb2_plane_size(&buf->vb, 0) < size)
|
||||
if (vb2_plane_size(&buf->vb.vb2_buf, 0) < size)
|
||||
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,
|
||||
sgt->sgl,
|
||||
@@ -1503,7 +1504,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
|
||||
if (list_empty(&cx88q->active)) {
|
||||
list_add_tail(&buf->queue, &cx88q->active);
|
||||
dprintk(1, "[%p/%d] %s - first active\n",
|
||||
buf, buf->vb.v4l2_buf.index, __func__);
|
||||
buf, buf->vb.vb2_buf.index, __func__);
|
||||
} else {
|
||||
buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
|
||||
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);
|
||||
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
|
||||
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);
|
||||
}
|
||||
@@ -1530,9 +1531,10 @@ static void do_cancel_buffers(struct cx23885_tsport *port, char *reason)
|
||||
buf = list_entry(q->active.next, struct cx23885_buffer,
|
||||
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",
|
||||
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);
|
||||
}
|
||||
|
@@ -92,7 +92,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
struct cx23885_tsport *port = vb->vb2_queue->drv_priv;
|
||||
struct cx23885_buffer *buf =
|
||||
container_of(vb, struct cx23885_buffer, vb);
|
||||
container_of(vbuf, struct cx23885_buffer, vb);
|
||||
|
||||
return cx23885_buf_prepare(buf, port);
|
||||
}
|
||||
|
||||
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_dev *dev = port->dev;
|
||||
struct cx23885_buffer *buf = container_of(vb,
|
||||
struct cx23885_buffer *buf = container_of(vbuf,
|
||||
struct cx23885_buffer, vb);
|
||||
|
||||
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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
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);
|
||||
|
||||
cx23885_buf_queue(port, buf);
|
||||
|
@@ -121,7 +121,7 @@ static int cx23885_start_vbi_dma(struct cx23885_dev *dev,
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
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 sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
|
||||
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)
|
||||
{
|
||||
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);
|
||||
|
||||
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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
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_dmaqueue *q = &dev->vbiq;
|
||||
unsigned long flags;
|
||||
@@ -206,7 +210,7 @@ static void buffer_queue(struct vb2_buffer *vb)
|
||||
list_add_tail(&buf->queue, &q->active);
|
||||
spin_unlock_irqrestore(&dev->slock, flags);
|
||||
dprintk(2, "[%p/%d] vbi_queue - first active\n",
|
||||
buf, buf->vb.v4l2_buf.index);
|
||||
buf, buf->vb.vb2_buf.index);
|
||||
|
||||
} else {
|
||||
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);
|
||||
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
|
||||
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);
|
||||
|
||||
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);
|
||||
}
|
||||
|
@@ -104,12 +104,12 @@ void cx23885_video_wakeup(struct cx23885_dev *dev,
|
||||
buf = list_entry(q->active.next,
|
||||
struct cx23885_buffer, queue);
|
||||
|
||||
buf->vb.v4l2_buf.sequence = q->count++;
|
||||
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
|
||||
dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.v4l2_buf.index,
|
||||
count, q->count);
|
||||
buf->vb.sequence = q->count++;
|
||||
v4l2_get_timestamp(&buf->vb.timestamp);
|
||||
dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf,
|
||||
buf->vb.vb2_buf.index, count, q->count);
|
||||
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)
|
||||
@@ -315,7 +315,7 @@ static int cx23885_start_video_dma(struct cx23885_dev *dev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
|
||||
struct cx23885_buffer *buf =
|
||||
container_of(vb, struct cx23885_buffer, vb);
|
||||
container_of(vbuf, struct cx23885_buffer, vb);
|
||||
u32 line0_offset, line1_offset;
|
||||
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
|
||||
int field_tff;
|
||||
@@ -401,7 +402,7 @@ static int buffer_prepare(struct vb2_buffer *vb)
|
||||
BUG();
|
||||
}
|
||||
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,
|
||||
(unsigned long)buf->risc.dma);
|
||||
return 0;
|
||||
@@ -409,7 +410,8 @@ static int buffer_prepare(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);
|
||||
|
||||
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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
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 *prev;
|
||||
struct cx23885_dmaqueue *q = &dev->vidq;
|
||||
@@ -455,7 +458,7 @@ static void buffer_queue(struct vb2_buffer *vb)
|
||||
if (list_empty(&q->active)) {
|
||||
list_add_tail(&buf->queue, &q->active);
|
||||
dprintk(2, "[%p/%d] buffer_queue - first active\n",
|
||||
buf, buf->vb.v4l2_buf.index);
|
||||
buf, buf->vb.vb2_buf.index);
|
||||
} else {
|
||||
buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
|
||||
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);
|
||||
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
|
||||
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);
|
||||
}
|
||||
@@ -492,7 +495,7 @@ static void cx23885_stop_streaming(struct vb2_queue *q)
|
||||
struct cx23885_buffer, 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);
|
||||
}
|
||||
|
@@ -170,7 +170,7 @@ struct cx23885_riscmem {
|
||||
/* buffer for one video frame */
|
||||
struct cx23885_buffer {
|
||||
/* common v4l buffer stuff -- must be first */
|
||||
struct vb2_buffer vb;
|
||||
struct vb2_v4l2_buffer vb;
|
||||
struct list_head queue;
|
||||
|
||||
/* cx23885 specific */
|
||||
|
@@ -102,7 +102,7 @@ struct cx25821_audio_dev {
|
||||
|
||||
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
|
||||
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
|
||||
static bool enable[SNDRV_CARDS] = { 1, [1 ... (SNDRV_CARDS - 1)] = 1 };
|
||||
static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
|
||||
|
||||
module_param_array(enable, bool, NULL, 0444);
|
||||
MODULE_PARM_DESC(enable, "Enable cx25821 soundcard. default enabled.");
|
||||
|
@@ -130,10 +130,10 @@ int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status)
|
||||
buf = list_entry(dmaq->active.next,
|
||||
struct cx25821_buffer, queue);
|
||||
|
||||
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
|
||||
buf->vb.v4l2_buf.sequence = dmaq->count++;
|
||||
v4l2_get_timestamp(&buf->vb.timestamp);
|
||||
buf->vb.sequence = dmaq->count++;
|
||||
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);
|
||||
handled++;
|
||||
@@ -141,10 +141,11 @@ int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status)
|
||||
return handled;
|
||||
}
|
||||
|
||||
static int cx25821_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int cx25821_queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
const struct v4l2_format *fmt = parg;
|
||||
struct cx25821_channel *chan = q->drv_priv;
|
||||
unsigned size = (chan->fmt->depth * chan->width * chan->height) >> 3;
|
||||
|
||||
@@ -159,10 +160,11 @@ static int cx25821_queue_setup(struct vb2_queue *q, const struct v4l2_format *fm
|
||||
|
||||
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_dev *dev = chan->dev;
|
||||
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);
|
||||
u32 line0_offset;
|
||||
int bpl_local = LINE_SIZE_D1;
|
||||
@@ -176,7 +178,7 @@ static int cx25821_buffer_prepare(struct vb2_buffer *vb)
|
||||
if (vb2_plane_size(vb, 0) < chan->height * buf->bpl)
|
||||
return -EINVAL;
|
||||
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) {
|
||||
bpl_local = buf->bpl;
|
||||
@@ -231,7 +233,7 @@ static int cx25821_buffer_prepare(struct vb2_buffer *vb)
|
||||
}
|
||||
|
||||
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,
|
||||
(unsigned long)buf->risc.dma);
|
||||
|
||||
@@ -240,8 +242,9 @@ static int cx25821_buffer_prepare(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 =
|
||||
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_dev *dev = chan->dev;
|
||||
|
||||
@@ -250,8 +253,9 @@ static void cx25821_buffer_finish(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 =
|
||||
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_dev *dev = chan->dev;
|
||||
struct cx25821_buffer *prev;
|
||||
@@ -300,7 +304,7 @@ static void cx25821_stop_streaming(struct vb2_queue *q)
|
||||
struct cx25821_buffer, 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);
|
||||
}
|
||||
|
@@ -34,6 +34,7 @@
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-sg.h>
|
||||
|
||||
#include "cx25821-reg.h"
|
||||
@@ -127,7 +128,7 @@ struct cx25821_riscmem {
|
||||
/* buffer for one video frame */
|
||||
struct cx25821_buffer {
|
||||
/* common v4l buffer stuff -- must be first */
|
||||
struct vb2_buffer vb;
|
||||
struct vb2_v4l2_buffer vb;
|
||||
struct list_head queue;
|
||||
|
||||
/* cx25821 specific */
|
||||
|
@@ -101,7 +101,7 @@ typedef struct cx88_audio_dev snd_cx88_card_t;
|
||||
|
||||
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
|
||||
static const char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
|
||||
static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
|
||||
static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
|
||||
|
||||
module_param_array(enable, bool, NULL, 0444);
|
||||
MODULE_PARM_DESC(enable, "Enable cx88x soundcard. default enabled.");
|
||||
|
@@ -637,7 +637,7 @@ static int blackbird_stop_codec(struct cx8802_dev *dev)
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
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);
|
||||
}
|
||||
|
||||
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 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;
|
||||
|
||||
if (risc->cpu)
|
||||
@@ -672,8 +674,9 @@ static void buffer_finish(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 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);
|
||||
}
|
||||
@@ -721,7 +724,7 @@ fail:
|
||||
struct cx88_buffer, 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);
|
||||
return err;
|
||||
@@ -749,7 +752,7 @@ static void stop_streaming(struct vb2_queue *q)
|
||||
struct cx88_buffer, 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);
|
||||
}
|
||||
|
@@ -518,11 +518,11 @@ void cx88_wakeup(struct cx88_core *core,
|
||||
|
||||
buf = list_entry(q->active.next,
|
||||
struct cx88_buffer, list);
|
||||
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
|
||||
buf->vb.v4l2_buf.field = core->field;
|
||||
buf->vb.v4l2_buf.sequence = q->count++;
|
||||
v4l2_get_timestamp(&buf->vb.timestamp);
|
||||
buf->vb.field = core->field;
|
||||
buf->vb.sequence = q->count++;
|
||||
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)
|
||||
|
@@ -82,7 +82,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
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);
|
||||
}
|
||||
|
||||
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 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;
|
||||
|
||||
if (risc->cpu)
|
||||
@@ -118,8 +120,9 @@ static void buffer_finish(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 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);
|
||||
}
|
||||
@@ -149,7 +152,7 @@ static void stop_streaming(struct vb2_queue *q)
|
||||
struct cx88_buffer, 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);
|
||||
}
|
||||
|
@@ -214,7 +214,7 @@ static int cx8802_restart_queue(struct cx8802_dev *dev,
|
||||
|
||||
buf = list_entry(q->active.next, struct cx88_buffer, list);
|
||||
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);
|
||||
return 0;
|
||||
}
|
||||
@@ -225,13 +225,13 @@ int cx8802_buf_prepare(struct vb2_queue *q, struct cx8802_dev *dev,
|
||||
struct cx88_buffer *buf)
|
||||
{
|
||||
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;
|
||||
int rc;
|
||||
|
||||
if (vb2_plane_size(&buf->vb, 0) < size)
|
||||
if (vb2_plane_size(&buf->vb.vb2_buf, 0) < size)
|
||||
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,
|
||||
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" );
|
||||
list_add_tail(&buf->list, &cx88q->active);
|
||||
dprintk(1,"[%p/%d] %s - first active\n",
|
||||
buf, buf->vb.v4l2_buf.index, __func__);
|
||||
buf, buf->vb.vb2_buf.index, __func__);
|
||||
|
||||
} else {
|
||||
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);
|
||||
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
|
||||
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)) {
|
||||
buf = list_entry(q->active.next, struct cx88_buffer, 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);
|
||||
}
|
||||
|
@@ -100,14 +100,14 @@ int cx8800_restart_vbi_queue(struct cx8800_dev *dev,
|
||||
|
||||
buf = list_entry(q->active.next, struct cx88_buffer, list);
|
||||
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);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
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);
|
||||
unsigned int lines;
|
||||
unsigned int size;
|
||||
@@ -149,8 +150,9 @@ static int buffer_prepare(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 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;
|
||||
|
||||
if (risc->cpu)
|
||||
@@ -160,8 +162,9 @@ static void buffer_finish(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 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_dmaqueue *q = &dev->vbiq;
|
||||
|
||||
@@ -174,7 +177,7 @@ static void buffer_queue(struct vb2_buffer *vb)
|
||||
list_add_tail(&buf->list, &q->active);
|
||||
cx8800_start_vbi_dma(dev, q, buf);
|
||||
dprintk(2,"[%p/%d] vbi_queue - first active\n",
|
||||
buf, buf->vb.v4l2_buf.index);
|
||||
buf, buf->vb.vb2_buf.index);
|
||||
|
||||
} else {
|
||||
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);
|
||||
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
|
||||
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);
|
||||
|
||||
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);
|
||||
}
|
||||
|
@@ -420,7 +420,7 @@ static int restart_video_queue(struct cx8800_dev *dev,
|
||||
if (!list_empty(&q->active)) {
|
||||
buf = list_entry(q->active.next, struct cx88_buffer, list);
|
||||
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);
|
||||
}
|
||||
return 0;
|
||||
@@ -429,7 +429,7 @@ static int restart_video_queue(struct cx8800_dev *dev,
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
|
||||
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);
|
||||
|
||||
buf->bpl = core->width * dev->fmt->depth >> 3;
|
||||
@@ -489,7 +490,7 @@ static int buffer_prepare(struct vb2_buffer *vb)
|
||||
break;
|
||||
}
|
||||
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,
|
||||
(unsigned long)buf->risc.dma);
|
||||
return 0;
|
||||
@@ -497,8 +498,9 @@ static int buffer_prepare(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 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;
|
||||
|
||||
if (risc->cpu)
|
||||
@@ -508,8 +510,9 @@ static void buffer_finish(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 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_core *core = dev->core;
|
||||
struct cx88_dmaqueue *q = &dev->vidq;
|
||||
@@ -522,7 +525,7 @@ static void buffer_queue(struct vb2_buffer *vb)
|
||||
if (list_empty(&q->active)) {
|
||||
list_add_tail(&buf->list, &q->active);
|
||||
dprintk(2,"[%p/%d] buffer_queue - first active\n",
|
||||
buf, buf->vb.v4l2_buf.index);
|
||||
buf, buf->vb.vb2_buf.index);
|
||||
|
||||
} else {
|
||||
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);
|
||||
prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
|
||||
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);
|
||||
|
||||
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);
|
||||
}
|
||||
|
@@ -321,7 +321,7 @@ struct cx88_riscmem {
|
||||
/* buffer for one video frame */
|
||||
struct cx88_buffer {
|
||||
/* common v4l buffer stuff -- must be first */
|
||||
struct vb2_buffer vb;
|
||||
struct vb2_v4l2_buffer vb;
|
||||
struct list_head list;
|
||||
|
||||
/* cx88 specific */
|
||||
|
@@ -131,11 +131,12 @@ static int wait_i2c_reg(void __iomem *addr)
|
||||
}
|
||||
|
||||
static int
|
||||
dt3155_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
|
||||
dt3155_queue_setup(struct vb2_queue *vq, const void *parg,
|
||||
unsigned int *nbuffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
|
||||
{
|
||||
const struct v4l2_format *fmt = parg;
|
||||
struct dt3155_priv *pd = vb2_get_drv_priv(vq);
|
||||
unsigned size = pd->width * pd->height;
|
||||
|
||||
@@ -160,7 +161,7 @@ static int dt3155_buf_prepare(struct vb2_buffer *vb)
|
||||
static int dt3155_start_streaming(struct vb2_queue *q, unsigned count)
|
||||
{
|
||||
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;
|
||||
|
||||
pd->sequence = 0;
|
||||
@@ -208,7 +209,7 @@ static void dt3155_stop_streaming(struct vb2_queue *q)
|
||||
|
||||
spin_lock_irq(&pd->lock);
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -222,6 +223,7 @@ static void dt3155_stop_streaming(struct vb2_queue *q)
|
||||
|
||||
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);
|
||||
|
||||
/* pd->vidq.streaming = 1 when dt3155_buf_queue() is invoked */
|
||||
@@ -229,7 +231,7 @@ static void dt3155_buf_queue(struct vb2_buffer *vb)
|
||||
if (pd->curr_buf)
|
||||
list_add_tail(&vb->done_entry, &pd->dmaq);
|
||||
else
|
||||
pd->curr_buf = vb;
|
||||
pd->curr_buf = vbuf;
|
||||
spin_unlock_irq(&pd->lock);
|
||||
}
|
||||
|
||||
@@ -269,14 +271,14 @@ static irqreturn_t dt3155_irq_handler_even(int irq, void *dev_id)
|
||||
|
||||
spin_lock(&ipd->lock);
|
||||
if (ipd->curr_buf && !list_empty(&ipd->dmaq)) {
|
||||
v4l2_get_timestamp(&ipd->curr_buf->v4l2_buf.timestamp);
|
||||
ipd->curr_buf->v4l2_buf.sequence = ipd->sequence++;
|
||||
ipd->curr_buf->v4l2_buf.field = V4L2_FIELD_NONE;
|
||||
vb2_buffer_done(ipd->curr_buf, VB2_BUF_STATE_DONE);
|
||||
v4l2_get_timestamp(&ipd->curr_buf->timestamp);
|
||||
ipd->curr_buf->sequence = ipd->sequence++;
|
||||
ipd->curr_buf->field = V4L2_FIELD_NONE;
|
||||
vb2_buffer_done(&ipd->curr_buf->vb2_buf, VB2_BUF_STATE_DONE);
|
||||
|
||||
ivb = list_first_entry(&ipd->dmaq, typeof(*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);
|
||||
iowrite32(dma_addr, ipd->regs + EVEN_DMA_START);
|
||||
iowrite32(dma_addr + ipd->width, ipd->regs + ODD_DMA_START);
|
||||
|
@@ -22,6 +22,7 @@
|
||||
#include <linux/interrupt.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-dev.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
#define DT3155_NAME "dt3155"
|
||||
#define DT3155_VER_MAJ 2
|
||||
@@ -181,7 +182,7 @@ struct dt3155_priv {
|
||||
struct pci_dev *pdev;
|
||||
struct vb2_queue vidq;
|
||||
struct vb2_alloc_ctx *alloc_ctx;
|
||||
struct vb2_buffer *curr_buf;
|
||||
struct vb2_v4l2_buffer *curr_buf;
|
||||
struct mutex mux;
|
||||
struct list_head dmaq;
|
||||
spinlock_t lock;
|
||||
|
@@ -41,6 +41,7 @@
|
||||
#include "ivtv-alsa-pcm.h"
|
||||
|
||||
int ivtv_alsa_debug;
|
||||
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
|
||||
|
||||
#define IVTV_DEBUG_ALSA_INFO(fmt, arg...) \
|
||||
do { \
|
||||
@@ -54,6 +55,10 @@ MODULE_PARM_DESC(debug,
|
||||
"\t\t\t 1/0x0001: warning\n"
|
||||
"\t\t\t 2/0x0002: info\n");
|
||||
|
||||
module_param_array(index, int, NULL, 0444);
|
||||
MODULE_PARM_DESC(index,
|
||||
"Index value for IVTV ALSA capture interface(s).\n");
|
||||
|
||||
MODULE_AUTHOR("Andy Walls");
|
||||
MODULE_DESCRIPTION("CX23415/CX23416 ALSA Interface");
|
||||
MODULE_SUPPORTED_DEVICE("CX23415/CX23416 MPEG2 encoder");
|
||||
@@ -137,7 +142,7 @@ static int snd_ivtv_init(struct v4l2_device *v4l2_dev)
|
||||
struct ivtv *itv = to_ivtv(v4l2_dev);
|
||||
struct snd_card *sc = NULL;
|
||||
struct snd_ivtv_card *itvsc;
|
||||
int ret;
|
||||
int ret, idx;
|
||||
|
||||
/* Numbrs steps from "Writing an ALSA Driver" by Takashi Iwai */
|
||||
|
||||
@@ -145,8 +150,10 @@ static int snd_ivtv_init(struct v4l2_device *v4l2_dev)
|
||||
/* This is a no-op for us. We'll use the itv->instance */
|
||||
|
||||
/* (2) Create a card instance */
|
||||
/* use first available id if not specified otherwise*/
|
||||
idx = index[itv->instance] == -1 ? SNDRV_DEFAULT_IDX1 : index[itv->instance];
|
||||
ret = snd_card_new(&itv->pdev->dev,
|
||||
SNDRV_DEFAULT_IDX1, /* use first available id */
|
||||
idx,
|
||||
SNDRV_DEFAULT_STR1, /* xid from end of shortname*/
|
||||
THIS_MODULE, 0, &sc);
|
||||
if (ret) {
|
||||
@@ -196,6 +203,9 @@ static int snd_ivtv_init(struct v4l2_device *v4l2_dev)
|
||||
goto err_exit_free;
|
||||
}
|
||||
|
||||
IVTV_ALSA_INFO("%s: Instance %d registered as ALSA card %d\n",
|
||||
__func__, itv->instance, sc->number);
|
||||
|
||||
return 0;
|
||||
|
||||
err_exit_free:
|
||||
|
@@ -75,15 +75,15 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma,
|
||||
ivtv_udma_get_page_info (&uv_dma, (unsigned long)args->uv_source, 360 * uv_decode_height);
|
||||
|
||||
/* Get user pages for DMA Xfer */
|
||||
down_read(¤t->mm->mmap_sem);
|
||||
y_pages = get_user_pages(current, current->mm, y_dma.uaddr, y_dma.page_count, 0, 1, &dma->map[0], NULL);
|
||||
y_pages = get_user_pages_unlocked(current, current->mm,
|
||||
y_dma.uaddr, y_dma.page_count, 0, 1,
|
||||
&dma->map[0]);
|
||||
uv_pages = 0; /* silence gcc. value is set and consumed only if: */
|
||||
if (y_pages == y_dma.page_count) {
|
||||
uv_pages = get_user_pages(current, current->mm,
|
||||
uv_dma.uaddr, uv_dma.page_count, 0, 1,
|
||||
&dma->map[y_pages], NULL);
|
||||
uv_pages = get_user_pages_unlocked(current, current->mm,
|
||||
uv_dma.uaddr, uv_dma.page_count, 0, 1,
|
||||
&dma->map[y_pages]);
|
||||
}
|
||||
up_read(¤t->mm->mmap_sem);
|
||||
|
||||
if (y_pages != y_dma.page_count || uv_pages != uv_dma.page_count) {
|
||||
int rc = -EFAULT;
|
||||
|
@@ -54,7 +54,7 @@ struct netup_dma {
|
||||
u8 num;
|
||||
spinlock_t lock;
|
||||
struct netup_unidvb_dev *ndev;
|
||||
struct netup_dma_regs *regs;
|
||||
struct netup_dma_regs __iomem *regs;
|
||||
u32 ring_buffer_size;
|
||||
u8 *addr_virt;
|
||||
dma_addr_t addr_phys;
|
||||
@@ -82,7 +82,7 @@ struct netup_i2c {
|
||||
wait_queue_head_t wq;
|
||||
struct i2c_adapter adap;
|
||||
struct netup_unidvb_dev *dev;
|
||||
struct netup_i2c_regs *regs;
|
||||
struct netup_i2c_regs __iomem *regs;
|
||||
struct i2c_msg *msg;
|
||||
enum netup_i2c_state state;
|
||||
u32 xmit_size;
|
||||
|
@@ -147,7 +147,7 @@ static int netup_unidvb_ci_read_attribute_mem(struct dvb_ca_en50221 *en50221,
|
||||
{
|
||||
struct netup_ci_state *state = en50221->data;
|
||||
struct netup_unidvb_dev *dev = state->dev;
|
||||
u8 val = state->membase8_config[addr];
|
||||
u8 val = *((u8 __force *)state->membase8_io + addr);
|
||||
|
||||
dev_dbg(&dev->pci_dev->dev,
|
||||
"%s(): addr=0x%x val=0x%x\n", __func__, addr, val);
|
||||
@@ -162,7 +162,7 @@ static int netup_unidvb_ci_write_attribute_mem(struct dvb_ca_en50221 *en50221,
|
||||
|
||||
dev_dbg(&dev->pci_dev->dev,
|
||||
"%s(): addr=0x%x data=0x%x\n", __func__, addr, data);
|
||||
state->membase8_config[addr] = data;
|
||||
*((u8 __force *)state->membase8_io + addr) = data;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -171,7 +171,7 @@ static int netup_unidvb_ci_read_cam_ctl(struct dvb_ca_en50221 *en50221,
|
||||
{
|
||||
struct netup_ci_state *state = en50221->data;
|
||||
struct netup_unidvb_dev *dev = state->dev;
|
||||
u8 val = state->membase8_io[addr];
|
||||
u8 val = *((u8 __force *)state->membase8_io + addr);
|
||||
|
||||
dev_dbg(&dev->pci_dev->dev,
|
||||
"%s(): addr=0x%x val=0x%x\n", __func__, addr, val);
|
||||
@@ -186,7 +186,7 @@ static int netup_unidvb_ci_write_cam_ctl(struct dvb_ca_en50221 *en50221,
|
||||
|
||||
dev_dbg(&dev->pci_dev->dev,
|
||||
"%s(): addr=0x%x data=0x%x\n", __func__, addr, data);
|
||||
state->membase8_io[addr] = data;
|
||||
*((u8 __force *)state->membase8_io + addr) = data;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -226,7 +226,7 @@ int netup_unidvb_ci_register(struct netup_unidvb_dev *dev,
|
||||
__func__, result);
|
||||
return result;
|
||||
}
|
||||
writew(NETUP_UNIDVB_IRQ_CI, (u16 *)(dev->bmmio0 + REG_IMASK_SET));
|
||||
writew(NETUP_UNIDVB_IRQ_CI, dev->bmmio0 + REG_IMASK_SET);
|
||||
dev_info(&pci_dev->dev,
|
||||
"%s(): CI adapter %d init done\n", __func__, num);
|
||||
return 0;
|
||||
|
@@ -27,6 +27,7 @@
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/list.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-vmalloc.h>
|
||||
|
||||
#include "netup_unidvb.h"
|
||||
@@ -110,7 +111,7 @@ struct netup_dma_regs {
|
||||
} __packed __aligned(1);
|
||||
|
||||
struct netup_unidvb_buffer {
|
||||
struct vb2_buffer vb;
|
||||
struct vb2_v4l2_buffer vb;
|
||||
struct list_head list;
|
||||
u32 size;
|
||||
};
|
||||
@@ -189,12 +190,10 @@ static void netup_unidvb_dma_enable(struct netup_dma *dma, int enable)
|
||||
"%s(): DMA%d enable %d\n", __func__, dma->num, enable);
|
||||
if (enable) {
|
||||
writel(BIT_DMA_RUN, &dma->regs->ctrlstat_set);
|
||||
writew(irq_mask,
|
||||
(u16 *)(dma->ndev->bmmio0 + REG_IMASK_SET));
|
||||
writew(irq_mask, dma->ndev->bmmio0 + REG_IMASK_SET);
|
||||
} else {
|
||||
writel(BIT_DMA_RUN, &dma->regs->ctrlstat_clear);
|
||||
writew(irq_mask,
|
||||
(u16 *)(dma->ndev->bmmio0 + REG_IMASK_CLEAR));
|
||||
writew(irq_mask, dma->ndev->bmmio0 + REG_IMASK_CLEAR);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -278,7 +277,7 @@ static irqreturn_t netup_unidvb_isr(int irq, void *dev_id)
|
||||
}
|
||||
|
||||
static int netup_unidvb_queue_setup(struct vb2_queue *vq,
|
||||
const struct v4l2_format *fmt,
|
||||
const void *parg,
|
||||
unsigned int *nbuffers,
|
||||
unsigned int *nplanes,
|
||||
unsigned int sizes[],
|
||||
@@ -300,7 +299,8 @@ static int netup_unidvb_queue_setup(struct vb2_queue *vq,
|
||||
static int netup_unidvb_buf_prepare(struct vb2_buffer *vb)
|
||||
{
|
||||
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);
|
||||
|
||||
dev_dbg(&dma->ndev->pci_dev->dev, "%s(): buf 0x%p\n", __func__, buf);
|
||||
@@ -312,7 +312,8 @@ static void netup_unidvb_buf_queue(struct vb2_buffer *vb)
|
||||
{
|
||||
unsigned long flags;
|
||||
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);
|
||||
|
||||
dev_dbg(&dma->ndev->pci_dev->dev, "%s(): %p\n", __func__, buf);
|
||||
@@ -509,7 +510,7 @@ static int netup_unidvb_ring_copy(struct netup_dma *dma,
|
||||
{
|
||||
u32 copy_bytes, ring_bytes;
|
||||
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;
|
||||
|
||||
if (p == NULL) {
|
||||
@@ -522,7 +523,7 @@ static int netup_unidvb_ring_copy(struct netup_dma *dma,
|
||||
ring_bytes = dma->ring_buffer_size - dma->data_offset;
|
||||
copy_bytes = (ring_bytes > buff_bytes) ?
|
||||
buff_bytes : ring_bytes;
|
||||
memcpy_fromio(p, dma->addr_virt + dma->data_offset, copy_bytes);
|
||||
memcpy_fromio(p, (u8 __iomem *)(dma->addr_virt + dma->data_offset), copy_bytes);
|
||||
p += copy_bytes;
|
||||
buf->size += copy_bytes;
|
||||
buff_bytes -= copy_bytes;
|
||||
@@ -535,7 +536,7 @@ static int netup_unidvb_ring_copy(struct netup_dma *dma,
|
||||
ring_bytes = dma->data_size;
|
||||
copy_bytes = (ring_bytes > buff_bytes) ?
|
||||
buff_bytes : ring_bytes;
|
||||
memcpy_fromio(p, dma->addr_virt + dma->data_offset, copy_bytes);
|
||||
memcpy_fromio(p, (u8 __iomem *)(dma->addr_virt + dma->data_offset), copy_bytes);
|
||||
buf->size += copy_bytes;
|
||||
dma->data_size -= copy_bytes;
|
||||
dma->data_offset += copy_bytes;
|
||||
@@ -579,9 +580,9 @@ static void netup_unidvb_dma_worker(struct work_struct *work)
|
||||
dev_dbg(&ndev->pci_dev->dev,
|
||||
"%s(): buffer %p done, size %d\n",
|
||||
__func__, buf, buf->size);
|
||||
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
|
||||
vb2_set_plane_payload(&buf->vb, 0, buf->size);
|
||||
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
|
||||
v4l2_get_timestamp(&buf->vb.timestamp);
|
||||
vb2_set_plane_payload(&buf->vb.vb2_buf, 0, buf->size);
|
||||
vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
|
||||
}
|
||||
}
|
||||
work_done:
|
||||
@@ -599,7 +600,7 @@ static void netup_unidvb_queue_cleanup(struct netup_dma *dma)
|
||||
buf = list_first_entry(&dma->free_buffers,
|
||||
struct netup_unidvb_buffer, 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);
|
||||
}
|
||||
@@ -641,10 +642,10 @@ static int netup_unidvb_dma_init(struct netup_unidvb_dev *ndev, int num)
|
||||
__func__, num, dma->addr_virt,
|
||||
(unsigned long long)dma->addr_phys,
|
||||
dma->ring_buffer_size);
|
||||
memset_io(dma->addr_virt, 0, dma->ring_buffer_size);
|
||||
memset_io((u8 __iomem *)dma->addr_virt, 0, dma->ring_buffer_size);
|
||||
dma->addr_last = dma->addr_phys;
|
||||
dma->high_addr = (u32)(dma->addr_phys & 0xC0000000);
|
||||
dma->regs = (struct netup_dma_regs *)(num == 0 ?
|
||||
dma->regs = (struct netup_dma_regs __iomem *)(num == 0 ?
|
||||
ndev->bmmio0 + NETUP_DMA0_ADDR :
|
||||
ndev->bmmio0 + NETUP_DMA1_ADDR);
|
||||
writel((NETUP_DMA_BLOCKS_COUNT << 24) |
|
||||
|
@@ -320,7 +320,7 @@ static int netup_i2c_init(struct netup_unidvb_dev *ndev, int bus_num)
|
||||
i2c = &ndev->i2c[bus_num];
|
||||
spin_lock_init(&i2c->lock);
|
||||
init_waitqueue_head(&i2c->wq);
|
||||
i2c->regs = (struct netup_i2c_regs *)(ndev->bmmio0 +
|
||||
i2c->regs = (struct netup_i2c_regs __iomem *)(ndev->bmmio0 +
|
||||
(bus_num == 0 ? NETUP_I2C_BUS0_ADDR : NETUP_I2C_BUS1_ADDR));
|
||||
netup_i2c_reset(i2c);
|
||||
i2c->adap = netup_i2c_adapter;
|
||||
|
@@ -45,7 +45,7 @@ struct netup_spi_regs {
|
||||
struct netup_spi {
|
||||
struct device *dev;
|
||||
struct spi_master *master;
|
||||
struct netup_spi_regs *regs;
|
||||
struct netup_spi_regs __iomem *regs;
|
||||
u8 __iomem *mmio;
|
||||
spinlock_t lock;
|
||||
wait_queue_head_t waitq;
|
||||
@@ -200,7 +200,7 @@ int netup_spi_init(struct netup_unidvb_dev *ndev)
|
||||
spin_lock_init(&nspi->lock);
|
||||
init_waitqueue_head(&nspi->waitq);
|
||||
nspi->master = master;
|
||||
nspi->regs = (struct netup_spi_regs *)(ndev->bmmio0 + 0x4000);
|
||||
nspi->regs = (struct netup_spi_regs __iomem *)(ndev->bmmio0 + 0x4000);
|
||||
writew(2, &nspi->regs->clock_divider);
|
||||
writew(NETUP_UNIDVB_IRQ_SPI, ndev->bmmio0 + REG_IMASK_SET);
|
||||
ndev->spi = nspi;
|
||||
|
@@ -5884,6 +5884,42 @@ struct saa7134_board saa7134_boards[] = {
|
||||
.amux = LINE1,
|
||||
},
|
||||
},
|
||||
[SAA7134_BOARD_LEADTEK_WINFAST_TV2100_FM] = {
|
||||
.name = "Leadtek Winfast TV2100 FM",
|
||||
.audio_clock = 0x00187de7,
|
||||
.tuner_type = TUNER_TNF_5335MF,
|
||||
.radio_type = UNSET,
|
||||
.tuner_addr = ADDR_UNSET,
|
||||
.radio_addr = ADDR_UNSET,
|
||||
.gpiomask = 0x0d,
|
||||
.inputs = {{
|
||||
.name = name_tv_mono,
|
||||
.vmux = 1,
|
||||
.amux = LINE1,
|
||||
.gpio = 0x00,
|
||||
.tv = 1,
|
||||
}, {
|
||||
.name = name_comp1,
|
||||
.vmux = 3,
|
||||
.amux = LINE2,
|
||||
.gpio = 0x08,
|
||||
}, {
|
||||
.name = name_svideo,
|
||||
.vmux = 8,
|
||||
.amux = LINE2,
|
||||
.gpio = 0x08,
|
||||
} },
|
||||
.radio = {
|
||||
.name = name_radio,
|
||||
.amux = LINE1,
|
||||
.gpio = 0x04,
|
||||
},
|
||||
.mute = {
|
||||
.name = name_mute,
|
||||
.amux = LINE1,
|
||||
.gpio = 0x08,
|
||||
},
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
@@ -7148,6 +7184,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
|
||||
.subvendor = 0x1461, /* Avermedia Technologies Inc */
|
||||
.subdevice = 0xa10a,
|
||||
.driver_data = SAA7134_BOARD_AVERMEDIA_505,
|
||||
}, {
|
||||
.vendor = PCI_VENDOR_ID_PHILIPS,
|
||||
.device = PCI_DEVICE_ID_PHILIPS_SAA7130,
|
||||
.subvendor = 0x107d,
|
||||
.subdevice = 0x6f3a,
|
||||
.driver_data = SAA7134_BOARD_LEADTEK_WINFAST_TV2100_FM,
|
||||
}, {
|
||||
/* --- boards without eeprom + subsystem ID --- */
|
||||
.vendor = PCI_VENDOR_ID_PHILIPS,
|
||||
@@ -7545,6 +7587,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
|
||||
case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS:
|
||||
case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM:
|
||||
case SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S:
|
||||
case SAA7134_BOARD_LEADTEK_WINFAST_TV2100_FM:
|
||||
dev->has_remote = SAA7134_REMOTE_GPIO;
|
||||
break;
|
||||
case SAA7134_BOARD_FLYDVBS_LR300:
|
||||
|
@@ -216,13 +216,14 @@ int saa7134_buffer_count(unsigned int size, unsigned int count)
|
||||
|
||||
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 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 += dma->sgl[0].offset;
|
||||
@@ -308,9 +309,9 @@ void saa7134_buffer_finish(struct saa7134_dev *dev,
|
||||
core_dbg("buffer_finish %p\n", q->curr);
|
||||
|
||||
/* finish current buffer */
|
||||
v4l2_get_timestamp(&q->curr->vb2.v4l2_buf.timestamp);
|
||||
q->curr->vb2.v4l2_buf.sequence = q->seq_nr++;
|
||||
vb2_buffer_done(&q->curr->vb2, state);
|
||||
v4l2_get_timestamp(&q->curr->vb2.timestamp);
|
||||
q->curr->vb2.sequence = q->seq_nr++;
|
||||
vb2_buffer_done(&q->curr->vb2.vb2_buf, state);
|
||||
q->curr = NULL;
|
||||
}
|
||||
|
||||
@@ -375,7 +376,8 @@ void saa7134_stop_streaming(struct saa7134_dev *dev, struct saa7134_dmaqueue *q)
|
||||
if (!list_empty(&q->queue)) {
|
||||
list_for_each_safe(pos, n, &q->queue) {
|
||||
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);
|
||||
tmp = NULL;
|
||||
}
|
||||
|
@@ -835,6 +835,13 @@ int saa7134_input_init1(struct saa7134_dev *dev)
|
||||
mask_keycode = 0xffff;
|
||||
raw_decode = true;
|
||||
break;
|
||||
case SAA7134_BOARD_LEADTEK_WINFAST_TV2100_FM:
|
||||
ir_codes = RC_MAP_LEADTEK_Y04G0051;
|
||||
mask_keydown = 0x0040000; /* Enable GPIO18 line on both edges */
|
||||
mask_keyup = 0x0040000;
|
||||
mask_keycode = 0xffff;
|
||||
raw_decode = true;
|
||||
break;
|
||||
}
|
||||
if (NULL == ir_codes) {
|
||||
pr_err("Oops: IR config error [card=%d]\n", dev->board);
|
||||
|
@@ -79,8 +79,9 @@ static int buffer_activate(struct saa7134_dev *dev,
|
||||
|
||||
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_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
|
||||
struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
|
||||
|
||||
dmaq->curr = NULL;
|
||||
buf->activate = buffer_activate;
|
||||
@@ -91,9 +92,10 @@ EXPORT_SYMBOL_GPL(saa7134_ts_buffer_init);
|
||||
|
||||
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_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);
|
||||
unsigned int lines, llength, size;
|
||||
|
||||
@@ -107,14 +109,14 @@ int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2)
|
||||
return -EINVAL;
|
||||
|
||||
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,
|
||||
saa7134_buffer_startpage(buf));
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(saa7134_ts_buffer_prepare);
|
||||
|
||||
int saa7134_ts_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
int saa7134_ts_queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *nbuffers, unsigned int *nplanes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -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_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) {
|
||||
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;
|
||||
}
|
||||
return -EBUSY;
|
||||
|
@@ -83,7 +83,7 @@ static int buffer_activate(struct saa7134_dev *dev,
|
||||
struct saa7134_buf *buf,
|
||||
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;
|
||||
|
||||
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_dev *dev = dmaq->dev;
|
||||
struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
|
||||
struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0);
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
|
||||
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;
|
||||
|
||||
if (dma->sgl->offset) {
|
||||
@@ -137,7 +138,7 @@ static int buffer_prepare(struct vb2_buffer *vb2)
|
||||
saa7134_buffer_startpage(buf));
|
||||
}
|
||||
|
||||
static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *nbuffers, unsigned int *nplanes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -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)
|
||||
{
|
||||
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;
|
||||
buf->activate = buffer_activate;
|
||||
|
@@ -791,7 +791,7 @@ static int buffer_activate(struct saa7134_dev *dev,
|
||||
struct saa7134_buf *buf,
|
||||
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 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)
|
||||
{
|
||||
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;
|
||||
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_dev *dev = dmaq->dev;
|
||||
struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
|
||||
struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0);
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
|
||||
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;
|
||||
|
||||
if (dma->sgl->offset) {
|
||||
@@ -896,13 +898,13 @@ static int buffer_prepare(struct vb2_buffer *vb2)
|
||||
return -EINVAL;
|
||||
|
||||
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,
|
||||
saa7134_buffer_startpage(buf));
|
||||
}
|
||||
|
||||
static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *nbuffers, unsigned int *nplanes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -932,7 +934,8 @@ void saa7134_vb2_buffer_queue(struct vb2_buffer *vb)
|
||||
{
|
||||
struct saa7134_dmaqueue *dmaq = vb->vb2_queue->drv_priv;
|
||||
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);
|
||||
}
|
||||
@@ -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_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) {
|
||||
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;
|
||||
}
|
||||
return -EBUSY;
|
||||
|
@@ -342,6 +342,7 @@ struct saa7134_card_ir {
|
||||
#define SAA7134_BOARD_AVERMEDIA_A706 192
|
||||
#define SAA7134_BOARD_WIS_VOYAGER 193
|
||||
#define SAA7134_BOARD_AVERMEDIA_505 194
|
||||
#define SAA7134_BOARD_LEADTEK_WINFAST_TV2100_FM 195
|
||||
|
||||
#define SAA7134_MAXBOARDS 32
|
||||
#define SAA7134_INPUT_MAX 8
|
||||
@@ -459,7 +460,7 @@ struct saa7134_thread {
|
||||
/* buffer for one video/vbi/ts frame */
|
||||
struct saa7134_buf {
|
||||
/* common v4l buffer stuff -- must be first */
|
||||
struct vb2_buffer vb2;
|
||||
struct vb2_v4l2_buffer vb2;
|
||||
|
||||
/* saa7134 specific */
|
||||
unsigned int top_seen;
|
||||
@@ -819,7 +820,7 @@ void saa7134_video_fini(struct saa7134_dev *dev);
|
||||
|
||||
int saa7134_ts_buffer_init(struct vb2_buffer *vb2);
|
||||
int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2);
|
||||
int saa7134_ts_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
int saa7134_ts_queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *nbuffers, unsigned int *nplanes,
|
||||
unsigned int sizes[], void *alloc_ctxs[]);
|
||||
int saa7134_ts_start_streaming(struct vb2_queue *vq, unsigned int count);
|
||||
|
@@ -5,7 +5,6 @@ config VIDEO_SAA7164
|
||||
select FW_LOADER
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEOBUF_DVB
|
||||
select DVB_TDA10048 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT
|
||||
select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT
|
||||
|
@@ -25,6 +25,18 @@
|
||||
#define ENCODER_MIN_BITRATE 1000000
|
||||
#define ENCODER_DEF_BITRATE 5000000
|
||||
|
||||
/*
|
||||
* This is a dummy non-zero value for the sizeimage field of v4l2_pix_format.
|
||||
* It is not actually used for anything since this driver does not support
|
||||
* stream I/O, only read(), and because this driver produces an MPEG stream
|
||||
* and not discrete frames. But the V4L2 spec doesn't allow for this value
|
||||
* to be 0, so set it to 0x10000 instead.
|
||||
*
|
||||
* If we ever change this driver to support stream I/O, then this field
|
||||
* will be the size of the streaming buffers.
|
||||
*/
|
||||
#define SAA7164_SIZEIMAGE (0x10000)
|
||||
|
||||
static struct saa7164_tvnorm saa7164_tvnorms[] = {
|
||||
{
|
||||
.name = "NTSC-M",
|
||||
@@ -35,24 +47,6 @@ static struct saa7164_tvnorm saa7164_tvnorms[] = {
|
||||
}
|
||||
};
|
||||
|
||||
static const u32 saa7164_v4l2_ctrls[] = {
|
||||
V4L2_CID_BRIGHTNESS,
|
||||
V4L2_CID_CONTRAST,
|
||||
V4L2_CID_SATURATION,
|
||||
V4L2_CID_HUE,
|
||||
V4L2_CID_AUDIO_VOLUME,
|
||||
V4L2_CID_SHARPNESS,
|
||||
V4L2_CID_MPEG_STREAM_TYPE,
|
||||
V4L2_CID_MPEG_VIDEO_ASPECT,
|
||||
V4L2_CID_MPEG_VIDEO_B_FRAMES,
|
||||
V4L2_CID_MPEG_VIDEO_GOP_SIZE,
|
||||
V4L2_CID_MPEG_AUDIO_MUTE,
|
||||
V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
|
||||
V4L2_CID_MPEG_VIDEO_BITRATE,
|
||||
V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,
|
||||
0
|
||||
};
|
||||
|
||||
/* Take the encoder configuration form the port struct and
|
||||
* flush it to the hardware.
|
||||
*/
|
||||
@@ -211,10 +205,8 @@ static int saa7164_encoder_initialize(struct saa7164_port *port)
|
||||
}
|
||||
|
||||
/* -- V4L2 --------------------------------------------------------- */
|
||||
static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id)
|
||||
int saa7164_s_std(struct saa7164_port *port, v4l2_std_id id)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
unsigned int i;
|
||||
|
||||
@@ -240,22 +232,33 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id)
|
||||
static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
|
||||
return saa7164_s_std(fh->port, id);
|
||||
}
|
||||
|
||||
int saa7164_g_std(struct saa7164_port *port, v4l2_std_id *id)
|
||||
{
|
||||
*id = port->std;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_enum_input(struct file *file, void *priv,
|
||||
struct v4l2_input *i)
|
||||
static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id)
|
||||
{
|
||||
int n;
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
|
||||
char *inputs[] = { "tuner", "composite", "svideo", "aux",
|
||||
"composite 2", "svideo 2", "aux 2" };
|
||||
return saa7164_g_std(fh->port, id);
|
||||
}
|
||||
|
||||
int saa7164_enum_input(struct file *file, void *priv, struct v4l2_input *i)
|
||||
{
|
||||
static const char * const inputs[] = {
|
||||
"tuner", "composite", "svideo", "aux",
|
||||
"composite 2", "svideo 2", "aux 2"
|
||||
};
|
||||
int n;
|
||||
|
||||
if (i->index >= 7)
|
||||
return -EINVAL;
|
||||
@@ -273,10 +276,8 @@ static int vidioc_enum_input(struct file *file, void *priv,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
|
||||
int saa7164_g_input(struct saa7164_port *port, unsigned int *i)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
if (saa7164_api_get_videomux(port) != SAA_OK)
|
||||
@@ -289,10 +290,15 @@ static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
|
||||
static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
|
||||
return saa7164_g_input(fh->port, i);
|
||||
}
|
||||
|
||||
int saa7164_s_input(struct saa7164_port *port, unsigned int i)
|
||||
{
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
dprintk(DBGLVL_ENC, "%s() input=%d\n", __func__, i);
|
||||
@@ -308,8 +314,14 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_tuner(struct file *file, void *priv,
|
||||
struct v4l2_tuner *t)
|
||||
static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
|
||||
return saa7164_s_input(fh->port, i);
|
||||
}
|
||||
|
||||
int saa7164_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
@@ -319,38 +331,45 @@ static int vidioc_g_tuner(struct file *file, void *priv,
|
||||
return -EINVAL;
|
||||
|
||||
strcpy(t->name, "tuner");
|
||||
t->type = V4L2_TUNER_ANALOG_TV;
|
||||
t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO;
|
||||
t->rangelow = SAA7164_TV_MIN_FREQ;
|
||||
t->rangehigh = SAA7164_TV_MAX_FREQ;
|
||||
|
||||
dprintk(DBGLVL_ENC, "VIDIOC_G_TUNER: tuner type %d\n", t->type);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_s_tuner(struct file *file, void *priv,
|
||||
const struct v4l2_tuner *t)
|
||||
int saa7164_s_tuner(struct file *file, void *priv,
|
||||
const struct v4l2_tuner *t)
|
||||
{
|
||||
if (0 != t->index)
|
||||
return -EINVAL;
|
||||
|
||||
/* Update the A/V core */
|
||||
return 0;
|
||||
}
|
||||
|
||||
int saa7164_g_frequency(struct saa7164_port *port, struct v4l2_frequency *f)
|
||||
{
|
||||
if (f->tuner)
|
||||
return -EINVAL;
|
||||
|
||||
f->frequency = port->freq;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_frequency(struct file *file, void *priv,
|
||||
struct v4l2_frequency *f)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
|
||||
f->type = V4L2_TUNER_ANALOG_TV;
|
||||
f->frequency = port->freq;
|
||||
|
||||
return 0;
|
||||
return saa7164_g_frequency(fh->port, f);
|
||||
}
|
||||
|
||||
static int vidioc_s_frequency(struct file *file, void *priv,
|
||||
const struct v4l2_frequency *f)
|
||||
int saa7164_s_frequency(struct saa7164_port *port,
|
||||
const struct v4l2_frequency *f)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
struct saa7164_port *tsport;
|
||||
struct dvb_frontend *fe;
|
||||
@@ -370,16 +389,13 @@ static int vidioc_s_frequency(struct file *file, void *priv,
|
||||
if (f->tuner != 0)
|
||||
return -EINVAL;
|
||||
|
||||
if (f->type != V4L2_TUNER_ANALOG_TV)
|
||||
return -EINVAL;
|
||||
|
||||
port->freq = f->frequency;
|
||||
port->freq = clamp(f->frequency,
|
||||
SAA7164_TV_MIN_FREQ, SAA7164_TV_MAX_FREQ);
|
||||
|
||||
/* Update the hardware */
|
||||
if (port->nr == SAA7164_PORT_ENC1)
|
||||
tsport = &dev->ports[SAA7164_PORT_TS1];
|
||||
else
|
||||
if (port->nr == SAA7164_PORT_ENC2)
|
||||
else if (port->nr == SAA7164_PORT_ENC2)
|
||||
tsport = &dev->ports[SAA7164_PORT_TS2];
|
||||
else
|
||||
BUG();
|
||||
@@ -396,253 +412,54 @@ static int vidioc_s_frequency(struct file *file, void *priv,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_ctrl(struct file *file, void *priv,
|
||||
struct v4l2_control *ctl)
|
||||
static int vidioc_s_frequency(struct file *file, void *priv,
|
||||
const struct v4l2_frequency *f)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
dprintk(DBGLVL_ENC, "%s(id=%d, value=%d)\n", __func__,
|
||||
ctl->id, ctl->value);
|
||||
|
||||
switch (ctl->id) {
|
||||
case V4L2_CID_BRIGHTNESS:
|
||||
ctl->value = port->ctl_brightness;
|
||||
break;
|
||||
case V4L2_CID_CONTRAST:
|
||||
ctl->value = port->ctl_contrast;
|
||||
break;
|
||||
case V4L2_CID_SATURATION:
|
||||
ctl->value = port->ctl_saturation;
|
||||
break;
|
||||
case V4L2_CID_HUE:
|
||||
ctl->value = port->ctl_hue;
|
||||
break;
|
||||
case V4L2_CID_SHARPNESS:
|
||||
ctl->value = port->ctl_sharpness;
|
||||
break;
|
||||
case V4L2_CID_AUDIO_VOLUME:
|
||||
ctl->value = port->ctl_volume;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return saa7164_s_frequency(fh->port, f);
|
||||
}
|
||||
|
||||
static int vidioc_s_ctrl(struct file *file, void *priv,
|
||||
struct v4l2_control *ctl)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
int ret = 0;
|
||||
|
||||
dprintk(DBGLVL_ENC, "%s(id=%d, value=%d)\n", __func__,
|
||||
ctl->id, ctl->value);
|
||||
|
||||
switch (ctl->id) {
|
||||
case V4L2_CID_BRIGHTNESS:
|
||||
if ((ctl->value >= 0) && (ctl->value <= 255)) {
|
||||
port->ctl_brightness = ctl->value;
|
||||
saa7164_api_set_usercontrol(port,
|
||||
PU_BRIGHTNESS_CONTROL);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
case V4L2_CID_CONTRAST:
|
||||
if ((ctl->value >= 0) && (ctl->value <= 255)) {
|
||||
port->ctl_contrast = ctl->value;
|
||||
saa7164_api_set_usercontrol(port, PU_CONTRAST_CONTROL);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
case V4L2_CID_SATURATION:
|
||||
if ((ctl->value >= 0) && (ctl->value <= 255)) {
|
||||
port->ctl_saturation = ctl->value;
|
||||
saa7164_api_set_usercontrol(port,
|
||||
PU_SATURATION_CONTROL);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
case V4L2_CID_HUE:
|
||||
if ((ctl->value >= 0) && (ctl->value <= 255)) {
|
||||
port->ctl_hue = ctl->value;
|
||||
saa7164_api_set_usercontrol(port, PU_HUE_CONTROL);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
case V4L2_CID_SHARPNESS:
|
||||
if ((ctl->value >= 0) && (ctl->value <= 255)) {
|
||||
port->ctl_sharpness = ctl->value;
|
||||
saa7164_api_set_usercontrol(port, PU_SHARPNESS_CONTROL);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
case V4L2_CID_AUDIO_VOLUME:
|
||||
if ((ctl->value >= -83) && (ctl->value <= 24)) {
|
||||
port->ctl_volume = ctl->value;
|
||||
saa7164_api_set_audio_volume(port, port->ctl_volume);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int saa7164_get_ctrl(struct saa7164_port *port,
|
||||
struct v4l2_ext_control *ctrl)
|
||||
{
|
||||
struct saa7164_encoder_params *params = &port->encoder_params;
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE:
|
||||
ctrl->value = params->bitrate;
|
||||
break;
|
||||
case V4L2_CID_MPEG_STREAM_TYPE:
|
||||
ctrl->value = params->stream_type;
|
||||
break;
|
||||
case V4L2_CID_MPEG_AUDIO_MUTE:
|
||||
ctrl->value = params->ctl_mute;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_ASPECT:
|
||||
ctrl->value = params->ctl_aspect;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:
|
||||
ctrl->value = params->bitrate_mode;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_B_FRAMES:
|
||||
ctrl->value = params->refdist;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:
|
||||
ctrl->value = params->bitrate_peak;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
|
||||
ctrl->value = params->gop_size;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_ext_ctrls(struct file *file, void *priv,
|
||||
struct v4l2_ext_controls *ctrls)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
int i, err = 0;
|
||||
|
||||
if (ctrls->ctrl_class == V4L2_CTRL_CLASS_MPEG) {
|
||||
for (i = 0; i < ctrls->count; i++) {
|
||||
struct v4l2_ext_control *ctrl = ctrls->controls + i;
|
||||
|
||||
err = saa7164_get_ctrl(port, ctrl);
|
||||
if (err) {
|
||||
ctrls->error_idx = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int saa7164_try_ctrl(struct v4l2_ext_control *ctrl, int ac3)
|
||||
{
|
||||
int ret = -EINVAL;
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE:
|
||||
if ((ctrl->value >= ENCODER_MIN_BITRATE) &&
|
||||
(ctrl->value <= ENCODER_MAX_BITRATE))
|
||||
ret = 0;
|
||||
break;
|
||||
case V4L2_CID_MPEG_STREAM_TYPE:
|
||||
if ((ctrl->value == V4L2_MPEG_STREAM_TYPE_MPEG2_PS) ||
|
||||
(ctrl->value == V4L2_MPEG_STREAM_TYPE_MPEG2_TS))
|
||||
ret = 0;
|
||||
break;
|
||||
case V4L2_CID_MPEG_AUDIO_MUTE:
|
||||
if ((ctrl->value >= 0) &&
|
||||
(ctrl->value <= 1))
|
||||
ret = 0;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_ASPECT:
|
||||
if ((ctrl->value >= V4L2_MPEG_VIDEO_ASPECT_1x1) &&
|
||||
(ctrl->value <= V4L2_MPEG_VIDEO_ASPECT_221x100))
|
||||
ret = 0;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
|
||||
if ((ctrl->value >= 0) &&
|
||||
(ctrl->value <= 255))
|
||||
ret = 0;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:
|
||||
if ((ctrl->value == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) ||
|
||||
(ctrl->value == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR))
|
||||
ret = 0;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_B_FRAMES:
|
||||
if ((ctrl->value >= 1) &&
|
||||
(ctrl->value <= 3))
|
||||
ret = 0;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:
|
||||
if ((ctrl->value >= ENCODER_MIN_BITRATE) &&
|
||||
(ctrl->value <= ENCODER_MAX_BITRATE))
|
||||
ret = 0;
|
||||
break;
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int vidioc_try_ext_ctrls(struct file *file, void *priv,
|
||||
struct v4l2_ext_controls *ctrls)
|
||||
{
|
||||
int i, err = 0;
|
||||
|
||||
if (ctrls->ctrl_class == V4L2_CTRL_CLASS_MPEG) {
|
||||
for (i = 0; i < ctrls->count; i++) {
|
||||
struct v4l2_ext_control *ctrl = ctrls->controls + i;
|
||||
|
||||
err = saa7164_try_ctrl(ctrl, 0);
|
||||
if (err) {
|
||||
ctrls->error_idx = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int saa7164_set_ctrl(struct saa7164_port *port,
|
||||
struct v4l2_ext_control *ctrl)
|
||||
static int saa7164_s_ctrl(struct v4l2_ctrl *ctrl)
|
||||
{
|
||||
struct saa7164_port *port =
|
||||
container_of(ctrl->handler, struct saa7164_port, ctrl_handler);
|
||||
struct saa7164_encoder_params *params = &port->encoder_params;
|
||||
int ret = 0;
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_BRIGHTNESS:
|
||||
port->ctl_brightness = ctrl->val;
|
||||
saa7164_api_set_usercontrol(port, PU_BRIGHTNESS_CONTROL);
|
||||
break;
|
||||
case V4L2_CID_CONTRAST:
|
||||
port->ctl_contrast = ctrl->val;
|
||||
saa7164_api_set_usercontrol(port, PU_CONTRAST_CONTROL);
|
||||
break;
|
||||
case V4L2_CID_SATURATION:
|
||||
port->ctl_saturation = ctrl->val;
|
||||
saa7164_api_set_usercontrol(port, PU_SATURATION_CONTROL);
|
||||
break;
|
||||
case V4L2_CID_HUE:
|
||||
port->ctl_hue = ctrl->val;
|
||||
saa7164_api_set_usercontrol(port, PU_HUE_CONTROL);
|
||||
break;
|
||||
case V4L2_CID_SHARPNESS:
|
||||
port->ctl_sharpness = ctrl->val;
|
||||
saa7164_api_set_usercontrol(port, PU_SHARPNESS_CONTROL);
|
||||
break;
|
||||
case V4L2_CID_AUDIO_VOLUME:
|
||||
port->ctl_volume = ctrl->val;
|
||||
saa7164_api_set_audio_volume(port, port->ctl_volume);
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE:
|
||||
params->bitrate = ctrl->value;
|
||||
params->bitrate = ctrl->val;
|
||||
break;
|
||||
case V4L2_CID_MPEG_STREAM_TYPE:
|
||||
params->stream_type = ctrl->value;
|
||||
params->stream_type = ctrl->val;
|
||||
break;
|
||||
case V4L2_CID_MPEG_AUDIO_MUTE:
|
||||
params->ctl_mute = ctrl->value;
|
||||
params->ctl_mute = ctrl->val;
|
||||
ret = saa7164_api_audio_mute(port, params->ctl_mute);
|
||||
if (ret != SAA_OK) {
|
||||
printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__,
|
||||
@@ -651,7 +468,7 @@ static int saa7164_set_ctrl(struct saa7164_port *port,
|
||||
}
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_ASPECT:
|
||||
params->ctl_aspect = ctrl->value;
|
||||
params->ctl_aspect = ctrl->val;
|
||||
ret = saa7164_api_set_aspect_ratio(port);
|
||||
if (ret != SAA_OK) {
|
||||
printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__,
|
||||
@@ -660,55 +477,24 @@ static int saa7164_set_ctrl(struct saa7164_port *port,
|
||||
}
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:
|
||||
params->bitrate_mode = ctrl->value;
|
||||
params->bitrate_mode = ctrl->val;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_B_FRAMES:
|
||||
params->refdist = ctrl->value;
|
||||
params->refdist = ctrl->val;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:
|
||||
params->bitrate_peak = ctrl->value;
|
||||
params->bitrate_peak = ctrl->val;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
|
||||
params->gop_size = ctrl->value;
|
||||
params->gop_size = ctrl->val;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
||||
/* TODO: Update the hardware */
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int vidioc_s_ext_ctrls(struct file *file, void *priv,
|
||||
struct v4l2_ext_controls *ctrls)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
int i, err = 0;
|
||||
|
||||
if (ctrls->ctrl_class == V4L2_CTRL_CLASS_MPEG) {
|
||||
for (i = 0; i < ctrls->count; i++) {
|
||||
struct v4l2_ext_control *ctrl = ctrls->controls + i;
|
||||
|
||||
err = saa7164_try_ctrl(ctrl, 0);
|
||||
if (err) {
|
||||
ctrls->error_idx = i;
|
||||
break;
|
||||
}
|
||||
err = saa7164_set_ctrl(port, ctrl);
|
||||
if (err) {
|
||||
ctrls->error_idx = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int vidioc_querycap(struct file *file, void *priv,
|
||||
struct v4l2_capability *cap)
|
||||
{
|
||||
@@ -745,145 +531,22 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
|
||||
static int vidioc_fmt_vid_cap(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
|
||||
f->fmt.pix.bytesperline = 0;
|
||||
f->fmt.pix.sizeimage =
|
||||
port->ts_packet_size * port->ts_packet_count;
|
||||
f->fmt.pix.colorspace = 0;
|
||||
f->fmt.pix.sizeimage = SAA7164_SIZEIMAGE;
|
||||
f->fmt.pix.field = V4L2_FIELD_INTERLACED;
|
||||
f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
|
||||
f->fmt.pix.width = port->width;
|
||||
f->fmt.pix.height = port->height;
|
||||
|
||||
dprintk(DBGLVL_ENC, "VIDIOC_G_FMT: w: %d, h: %d\n",
|
||||
port->width, port->height);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
|
||||
f->fmt.pix.bytesperline = 0;
|
||||
f->fmt.pix.sizeimage =
|
||||
port->ts_packet_size * port->ts_packet_count;
|
||||
f->fmt.pix.colorspace = 0;
|
||||
dprintk(DBGLVL_ENC, "VIDIOC_TRY_FMT: w: %d, h: %d\n",
|
||||
port->width, port->height);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
|
||||
f->fmt.pix.bytesperline = 0;
|
||||
f->fmt.pix.sizeimage =
|
||||
port->ts_packet_size * port->ts_packet_count;
|
||||
f->fmt.pix.colorspace = 0;
|
||||
|
||||
dprintk(DBGLVL_ENC, "VIDIOC_S_FMT: w: %d, h: %d, f: %d\n",
|
||||
f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.field);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int fill_queryctrl(struct saa7164_encoder_params *params,
|
||||
struct v4l2_queryctrl *c)
|
||||
{
|
||||
switch (c->id) {
|
||||
case V4L2_CID_BRIGHTNESS:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 127);
|
||||
case V4L2_CID_CONTRAST:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 66);
|
||||
case V4L2_CID_SATURATION:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 62);
|
||||
case V4L2_CID_HUE:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 128);
|
||||
case V4L2_CID_SHARPNESS:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0x0f, 1, 8);
|
||||
case V4L2_CID_MPEG_AUDIO_MUTE:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0x01, 1, 0);
|
||||
case V4L2_CID_AUDIO_VOLUME:
|
||||
return v4l2_ctrl_query_fill(c, -83, 24, 1, 20);
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE:
|
||||
return v4l2_ctrl_query_fill(c,
|
||||
ENCODER_MIN_BITRATE, ENCODER_MAX_BITRATE,
|
||||
100000, ENCODER_DEF_BITRATE);
|
||||
case V4L2_CID_MPEG_STREAM_TYPE:
|
||||
return v4l2_ctrl_query_fill(c,
|
||||
V4L2_MPEG_STREAM_TYPE_MPEG2_PS,
|
||||
V4L2_MPEG_STREAM_TYPE_MPEG2_TS,
|
||||
1, V4L2_MPEG_STREAM_TYPE_MPEG2_PS);
|
||||
case V4L2_CID_MPEG_VIDEO_ASPECT:
|
||||
return v4l2_ctrl_query_fill(c,
|
||||
V4L2_MPEG_VIDEO_ASPECT_1x1,
|
||||
V4L2_MPEG_VIDEO_ASPECT_221x100,
|
||||
1, V4L2_MPEG_VIDEO_ASPECT_4x3);
|
||||
case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
|
||||
return v4l2_ctrl_query_fill(c, 1, 255, 1, 15);
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:
|
||||
return v4l2_ctrl_query_fill(c,
|
||||
V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,
|
||||
V4L2_MPEG_VIDEO_BITRATE_MODE_CBR,
|
||||
1, V4L2_MPEG_VIDEO_BITRATE_MODE_VBR);
|
||||
case V4L2_CID_MPEG_VIDEO_B_FRAMES:
|
||||
return v4l2_ctrl_query_fill(c,
|
||||
1, 3, 1, 1);
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:
|
||||
return v4l2_ctrl_query_fill(c,
|
||||
ENCODER_MIN_BITRATE, ENCODER_MAX_BITRATE,
|
||||
100000, ENCODER_DEF_BITRATE);
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
static int vidioc_queryctrl(struct file *file, void *priv,
|
||||
struct v4l2_queryctrl *c)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = priv;
|
||||
struct saa7164_port *port = fh->port;
|
||||
int i, next;
|
||||
u32 id = c->id;
|
||||
|
||||
memset(c, 0, sizeof(*c));
|
||||
|
||||
next = !!(id & V4L2_CTRL_FLAG_NEXT_CTRL);
|
||||
c->id = id & ~V4L2_CTRL_FLAG_NEXT_CTRL;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(saa7164_v4l2_ctrls); i++) {
|
||||
if (next) {
|
||||
if (c->id < saa7164_v4l2_ctrls[i])
|
||||
c->id = saa7164_v4l2_ctrls[i];
|
||||
else
|
||||
continue;
|
||||
}
|
||||
|
||||
if (c->id == saa7164_v4l2_ctrls[i])
|
||||
return fill_queryctrl(&port->encoder_params, c);
|
||||
|
||||
if (c->id < saa7164_v4l2_ctrls[i])
|
||||
break;
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int saa7164_encoder_stop_port(struct saa7164_port *port)
|
||||
{
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
@@ -1084,8 +747,10 @@ static int fops_open(struct file *file)
|
||||
if (NULL == fh)
|
||||
return -ENOMEM;
|
||||
|
||||
file->private_data = fh;
|
||||
fh->port = port;
|
||||
v4l2_fh_init(&fh->fh, video_devdata(file));
|
||||
v4l2_fh_add(&fh->fh);
|
||||
file->private_data = fh;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -1106,7 +771,8 @@ static int fops_release(struct file *file)
|
||||
}
|
||||
}
|
||||
|
||||
file->private_data = NULL;
|
||||
v4l2_fh_del(&fh->fh);
|
||||
v4l2_fh_exit(&fh->fh);
|
||||
kfree(fh);
|
||||
|
||||
return 0;
|
||||
@@ -1250,10 +916,11 @@ err:
|
||||
|
||||
static unsigned int fops_poll(struct file *file, poll_table *wait)
|
||||
{
|
||||
unsigned long req_events = poll_requested_events(wait);
|
||||
struct saa7164_encoder_fh *fh =
|
||||
(struct saa7164_encoder_fh *)file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
unsigned int mask = 0;
|
||||
unsigned int mask = v4l2_ctrl_poll(file, wait);
|
||||
|
||||
port->last_poll_msecs_diff = port->last_poll_msecs;
|
||||
port->last_poll_msecs = jiffies_to_msecs(jiffies);
|
||||
@@ -1263,26 +930,18 @@ static unsigned int fops_poll(struct file *file, poll_table *wait)
|
||||
saa7164_histogram_update(&port->poll_interval,
|
||||
port->last_poll_msecs_diff);
|
||||
|
||||
if (!video_is_registered(port->v4l_device))
|
||||
return -EIO;
|
||||
if (!(req_events & (POLLIN | POLLRDNORM)))
|
||||
return mask;
|
||||
|
||||
if (atomic_cmpxchg(&fh->v4l_reading, 0, 1) == 0) {
|
||||
if (atomic_inc_return(&port->v4l_reader_count) == 1) {
|
||||
if (saa7164_encoder_initialize(port) < 0)
|
||||
return -EINVAL;
|
||||
return mask | POLLERR;
|
||||
saa7164_encoder_start_streaming(port);
|
||||
msleep(200);
|
||||
}
|
||||
}
|
||||
|
||||
/* blocking wait for buffer */
|
||||
if ((file->f_flags & O_NONBLOCK) == 0) {
|
||||
if (wait_event_interruptible(port->wait_read,
|
||||
saa7164_enc_next_buf(port))) {
|
||||
return -ERESTARTSYS;
|
||||
}
|
||||
}
|
||||
|
||||
/* Pull the first buffer from the used list */
|
||||
if (!list_empty(&port->list_buf_used.list))
|
||||
mask |= POLLIN | POLLRDNORM;
|
||||
@@ -1290,6 +949,10 @@ static unsigned int fops_poll(struct file *file, poll_table *wait)
|
||||
return mask;
|
||||
}
|
||||
|
||||
static const struct v4l2_ctrl_ops saa7164_ctrl_ops = {
|
||||
.s_ctrl = saa7164_s_ctrl,
|
||||
};
|
||||
|
||||
static const struct v4l2_file_operations mpeg_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = fops_open,
|
||||
@@ -1302,24 +965,21 @@ static const struct v4l2_file_operations mpeg_fops = {
|
||||
static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
|
||||
.vidioc_s_std = vidioc_s_std,
|
||||
.vidioc_g_std = vidioc_g_std,
|
||||
.vidioc_enum_input = vidioc_enum_input,
|
||||
.vidioc_enum_input = saa7164_enum_input,
|
||||
.vidioc_g_input = vidioc_g_input,
|
||||
.vidioc_s_input = vidioc_s_input,
|
||||
.vidioc_g_tuner = vidioc_g_tuner,
|
||||
.vidioc_s_tuner = vidioc_s_tuner,
|
||||
.vidioc_g_tuner = saa7164_g_tuner,
|
||||
.vidioc_s_tuner = saa7164_s_tuner,
|
||||
.vidioc_g_frequency = vidioc_g_frequency,
|
||||
.vidioc_s_frequency = vidioc_s_frequency,
|
||||
.vidioc_s_ctrl = vidioc_s_ctrl,
|
||||
.vidioc_g_ctrl = vidioc_g_ctrl,
|
||||
.vidioc_querycap = vidioc_querycap,
|
||||
.vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
|
||||
.vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
|
||||
.vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
|
||||
.vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
|
||||
.vidioc_g_ext_ctrls = vidioc_g_ext_ctrls,
|
||||
.vidioc_s_ext_ctrls = vidioc_s_ext_ctrls,
|
||||
.vidioc_try_ext_ctrls = vidioc_try_ext_ctrls,
|
||||
.vidioc_queryctrl = vidioc_queryctrl,
|
||||
.vidioc_g_fmt_vid_cap = vidioc_fmt_vid_cap,
|
||||
.vidioc_try_fmt_vid_cap = vidioc_fmt_vid_cap,
|
||||
.vidioc_s_fmt_vid_cap = vidioc_fmt_vid_cap,
|
||||
.vidioc_log_status = v4l2_ctrl_log_status,
|
||||
.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
|
||||
.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
|
||||
};
|
||||
|
||||
static struct video_device saa7164_mpeg_template = {
|
||||
@@ -1357,6 +1017,7 @@ static struct video_device *saa7164_encoder_alloc(
|
||||
int saa7164_encoder_register(struct saa7164_port *port)
|
||||
{
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
struct v4l2_ctrl_handler *hdl = &port->ctrl_handler;
|
||||
int result = -ENODEV;
|
||||
|
||||
dprintk(DBGLVL_ENC, "%s()\n", __func__);
|
||||
@@ -1381,19 +1042,52 @@ int saa7164_encoder_register(struct saa7164_port *port)
|
||||
port->video_format = EU_VIDEO_FORMAT_MPEG_2;
|
||||
port->audio_format = 0;
|
||||
port->video_resolution = 0;
|
||||
port->ctl_brightness = 127;
|
||||
port->ctl_contrast = 66;
|
||||
port->ctl_hue = 128;
|
||||
port->ctl_saturation = 62;
|
||||
port->ctl_sharpness = 8;
|
||||
port->encoder_params.bitrate = ENCODER_DEF_BITRATE;
|
||||
port->encoder_params.bitrate_peak = ENCODER_DEF_BITRATE;
|
||||
port->encoder_params.bitrate_mode = V4L2_MPEG_VIDEO_BITRATE_MODE_CBR;
|
||||
port->encoder_params.stream_type = V4L2_MPEG_STREAM_TYPE_MPEG2_PS;
|
||||
port->encoder_params.ctl_mute = 0;
|
||||
port->encoder_params.ctl_aspect = V4L2_MPEG_VIDEO_ASPECT_4x3;
|
||||
port->encoder_params.refdist = 1;
|
||||
port->encoder_params.gop_size = SAA7164_ENCODER_DEFAULT_GOP_SIZE;
|
||||
port->freq = SAA7164_TV_MIN_FREQ;
|
||||
|
||||
v4l2_ctrl_handler_init(hdl, 14);
|
||||
v4l2_ctrl_new_std(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_BRIGHTNESS, 0, 255, 1, 127);
|
||||
v4l2_ctrl_new_std(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_CONTRAST, 0, 255, 1, 66);
|
||||
v4l2_ctrl_new_std(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_SATURATION, 0, 255, 1, 62);
|
||||
v4l2_ctrl_new_std(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_HUE, 0, 255, 1, 128);
|
||||
v4l2_ctrl_new_std(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_SHARPNESS, 0x0, 0x0f, 1, 8);
|
||||
v4l2_ctrl_new_std(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_MPEG_AUDIO_MUTE, 0x0, 0x01, 1, 0);
|
||||
v4l2_ctrl_new_std(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_AUDIO_VOLUME, -83, 24, 1, 20);
|
||||
v4l2_ctrl_new_std(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_MPEG_VIDEO_BITRATE,
|
||||
ENCODER_MIN_BITRATE, ENCODER_MAX_BITRATE,
|
||||
100000, ENCODER_DEF_BITRATE);
|
||||
v4l2_ctrl_new_std_menu(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_MPEG_STREAM_TYPE,
|
||||
V4L2_MPEG_STREAM_TYPE_MPEG2_TS, 0,
|
||||
V4L2_MPEG_STREAM_TYPE_MPEG2_PS);
|
||||
v4l2_ctrl_new_std_menu(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_MPEG_VIDEO_ASPECT,
|
||||
V4L2_MPEG_VIDEO_ASPECT_221x100, 0,
|
||||
V4L2_MPEG_VIDEO_ASPECT_4x3);
|
||||
v4l2_ctrl_new_std(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_MPEG_VIDEO_GOP_SIZE, 1, 255, 1, 15);
|
||||
v4l2_ctrl_new_std_menu(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
|
||||
V4L2_MPEG_VIDEO_BITRATE_MODE_CBR, 0,
|
||||
V4L2_MPEG_VIDEO_BITRATE_MODE_VBR);
|
||||
v4l2_ctrl_new_std(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_MPEG_VIDEO_B_FRAMES, 1, 3, 1, 1);
|
||||
v4l2_ctrl_new_std(hdl, &saa7164_ctrl_ops,
|
||||
V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,
|
||||
ENCODER_MIN_BITRATE, ENCODER_MAX_BITRATE,
|
||||
100000, ENCODER_DEF_BITRATE);
|
||||
if (hdl->error) {
|
||||
result = hdl->error;
|
||||
goto failed;
|
||||
}
|
||||
|
||||
port->std = V4L2_STD_NTSC_M;
|
||||
|
||||
if (port->encodernorm.id & V4L2_STD_525_60)
|
||||
@@ -1412,6 +1106,8 @@ int saa7164_encoder_register(struct saa7164_port *port)
|
||||
goto failed;
|
||||
}
|
||||
|
||||
port->v4l_device->ctrl_handler = hdl;
|
||||
v4l2_ctrl_handler_setup(hdl);
|
||||
video_set_drvdata(port->v4l_device, port);
|
||||
result = video_register_device(port->v4l_device,
|
||||
VFL_TYPE_GRABBER, -1);
|
||||
@@ -1466,6 +1162,7 @@ void saa7164_encoder_unregister(struct saa7164_port *port)
|
||||
|
||||
port->v4l_device = NULL;
|
||||
}
|
||||
v4l2_ctrl_handler_free(&port->ctrl_handler);
|
||||
|
||||
dprintk(DBGLVL_ENC, "%s(port=%d) done\n", __func__, port->nr);
|
||||
}
|
||||
|
@@ -21,20 +21,6 @@
|
||||
|
||||
#include "saa7164.h"
|
||||
|
||||
static struct saa7164_tvnorm saa7164_tvnorms[] = {
|
||||
{
|
||||
.name = "NTSC-M",
|
||||
.id = V4L2_STD_NTSC_M,
|
||||
}, {
|
||||
.name = "NTSC-JP",
|
||||
.id = V4L2_STD_NTSC_M_JP,
|
||||
}
|
||||
};
|
||||
|
||||
static const u32 saa7164_v4l2_ctrls[] = {
|
||||
0
|
||||
};
|
||||
|
||||
/* Take the encoder configuration from the port struct and
|
||||
* flush it to the hardware.
|
||||
*/
|
||||
@@ -43,23 +29,13 @@ static void saa7164_vbi_configure(struct saa7164_port *port)
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
dprintk(DBGLVL_VBI, "%s()\n", __func__);
|
||||
|
||||
port->vbi_params.width = port->width;
|
||||
port->vbi_params.height = port->height;
|
||||
port->vbi_params.width = port->enc_port->width;
|
||||
port->vbi_params.height = port->enc_port->height;
|
||||
port->vbi_params.is_50hz =
|
||||
(port->encodernorm.id & V4L2_STD_625_50) != 0;
|
||||
(port->enc_port->encodernorm.id & V4L2_STD_625_50) != 0;
|
||||
|
||||
/* Set up the DIF (enable it) for analog mode by default */
|
||||
saa7164_api_initialize_dif(port);
|
||||
|
||||
/* Configure the correct video standard */
|
||||
#if 0
|
||||
saa7164_api_configure_dif(port, port->encodernorm.id);
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
/* Ensure the audio decoder is correct configured */
|
||||
saa7164_api_set_audio_std(port);
|
||||
#endif
|
||||
dprintk(DBGLVL_VBI, "%s() ends\n", __func__);
|
||||
}
|
||||
|
||||
@@ -186,468 +162,50 @@ static int saa7164_vbi_initialize(struct saa7164_port *port)
|
||||
static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
unsigned int i;
|
||||
|
||||
dprintk(DBGLVL_VBI, "%s(id=0x%x)\n", __func__, (u32)id);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(saa7164_tvnorms); i++) {
|
||||
if (id & saa7164_tvnorms[i].id)
|
||||
break;
|
||||
}
|
||||
if (i == ARRAY_SIZE(saa7164_tvnorms))
|
||||
return -EINVAL;
|
||||
|
||||
port->encodernorm = saa7164_tvnorms[i];
|
||||
port->std = id;
|
||||
|
||||
/* Update the audio decoder while is not running in
|
||||
* auto detect mode.
|
||||
*/
|
||||
saa7164_api_set_audio_std(port);
|
||||
|
||||
dprintk(DBGLVL_VBI, "%s(id=0x%x) OK\n", __func__, (u32)id);
|
||||
|
||||
return 0;
|
||||
return saa7164_s_std(fh->port->enc_port, id);
|
||||
}
|
||||
|
||||
static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id)
|
||||
{
|
||||
struct saa7164_encoder_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
|
||||
*id = port->std;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_enum_input(struct file *file, void *priv,
|
||||
struct v4l2_input *i)
|
||||
{
|
||||
int n;
|
||||
|
||||
char *inputs[] = { "tuner", "composite", "svideo", "aux",
|
||||
"composite 2", "svideo 2", "aux 2" };
|
||||
|
||||
if (i->index >= 7)
|
||||
return -EINVAL;
|
||||
|
||||
strcpy(i->name, inputs[i->index]);
|
||||
|
||||
if (i->index == 0)
|
||||
i->type = V4L2_INPUT_TYPE_TUNER;
|
||||
else
|
||||
i->type = V4L2_INPUT_TYPE_CAMERA;
|
||||
|
||||
for (n = 0; n < ARRAY_SIZE(saa7164_tvnorms); n++)
|
||||
i->std |= saa7164_tvnorms[n].id;
|
||||
|
||||
return 0;
|
||||
return saa7164_g_std(fh->port->enc_port, id);
|
||||
}
|
||||
|
||||
static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
if (saa7164_api_get_videomux(port) != SAA_OK)
|
||||
return -EIO;
|
||||
|
||||
*i = (port->mux_input - 1);
|
||||
|
||||
dprintk(DBGLVL_VBI, "%s() input=%d\n", __func__, *i);
|
||||
|
||||
return 0;
|
||||
return saa7164_g_input(fh->port->enc_port, i);
|
||||
}
|
||||
|
||||
static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
dprintk(DBGLVL_VBI, "%s() input=%d\n", __func__, i);
|
||||
|
||||
if (i >= 7)
|
||||
return -EINVAL;
|
||||
|
||||
port->mux_input = i + 1;
|
||||
|
||||
if (saa7164_api_set_videomux(port) != SAA_OK)
|
||||
return -EIO;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_tuner(struct file *file, void *priv,
|
||||
struct v4l2_tuner *t)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
if (0 != t->index)
|
||||
return -EINVAL;
|
||||
|
||||
strcpy(t->name, "tuner");
|
||||
t->type = V4L2_TUNER_ANALOG_TV;
|
||||
t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO;
|
||||
|
||||
dprintk(DBGLVL_VBI, "VIDIOC_G_TUNER: tuner type %d\n", t->type);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_s_tuner(struct file *file, void *priv,
|
||||
const struct v4l2_tuner *t)
|
||||
{
|
||||
/* Update the A/V core */
|
||||
return 0;
|
||||
return saa7164_s_input(fh->port->enc_port, i);
|
||||
}
|
||||
|
||||
static int vidioc_g_frequency(struct file *file, void *priv,
|
||||
struct v4l2_frequency *f)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
|
||||
f->type = V4L2_TUNER_ANALOG_TV;
|
||||
f->frequency = port->freq;
|
||||
|
||||
return 0;
|
||||
return saa7164_g_frequency(fh->port->enc_port, f);
|
||||
}
|
||||
|
||||
static int vidioc_s_frequency(struct file *file, void *priv,
|
||||
const struct v4l2_frequency *f)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
struct saa7164_port *tsport;
|
||||
struct dvb_frontend *fe;
|
||||
|
||||
/* TODO: Pull this for the std */
|
||||
struct analog_parameters params = {
|
||||
.mode = V4L2_TUNER_ANALOG_TV,
|
||||
.audmode = V4L2_TUNER_MODE_STEREO,
|
||||
.std = port->encodernorm.id,
|
||||
.frequency = f->frequency
|
||||
};
|
||||
|
||||
/* Stop the encoder */
|
||||
dprintk(DBGLVL_VBI, "%s() frequency=%d tuner=%d\n", __func__,
|
||||
f->frequency, f->tuner);
|
||||
|
||||
if (f->tuner != 0)
|
||||
return -EINVAL;
|
||||
|
||||
if (f->type != V4L2_TUNER_ANALOG_TV)
|
||||
return -EINVAL;
|
||||
|
||||
port->freq = f->frequency;
|
||||
|
||||
/* Update the hardware */
|
||||
if (port->nr == SAA7164_PORT_VBI1)
|
||||
tsport = &dev->ports[SAA7164_PORT_TS1];
|
||||
else
|
||||
if (port->nr == SAA7164_PORT_VBI2)
|
||||
tsport = &dev->ports[SAA7164_PORT_TS2];
|
||||
else
|
||||
BUG();
|
||||
|
||||
fe = tsport->dvb.frontend;
|
||||
|
||||
if (fe && fe->ops.tuner_ops.set_analog_params)
|
||||
fe->ops.tuner_ops.set_analog_params(fe, ¶ms);
|
||||
else
|
||||
printk(KERN_ERR "%s() No analog tuner, aborting\n", __func__);
|
||||
|
||||
saa7164_vbi_initialize(port);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_ctrl(struct file *file, void *priv,
|
||||
struct v4l2_control *ctl)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
dprintk(DBGLVL_VBI, "%s(id=%d, value=%d)\n", __func__,
|
||||
ctl->id, ctl->value);
|
||||
|
||||
switch (ctl->id) {
|
||||
case V4L2_CID_BRIGHTNESS:
|
||||
ctl->value = port->ctl_brightness;
|
||||
break;
|
||||
case V4L2_CID_CONTRAST:
|
||||
ctl->value = port->ctl_contrast;
|
||||
break;
|
||||
case V4L2_CID_SATURATION:
|
||||
ctl->value = port->ctl_saturation;
|
||||
break;
|
||||
case V4L2_CID_HUE:
|
||||
ctl->value = port->ctl_hue;
|
||||
break;
|
||||
case V4L2_CID_SHARPNESS:
|
||||
ctl->value = port->ctl_sharpness;
|
||||
break;
|
||||
case V4L2_CID_AUDIO_VOLUME:
|
||||
ctl->value = port->ctl_volume;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_s_ctrl(struct file *file, void *priv,
|
||||
struct v4l2_control *ctl)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
int ret = 0;
|
||||
|
||||
dprintk(DBGLVL_VBI, "%s(id=%d, value=%d)\n", __func__,
|
||||
ctl->id, ctl->value);
|
||||
|
||||
switch (ctl->id) {
|
||||
case V4L2_CID_BRIGHTNESS:
|
||||
if ((ctl->value >= 0) && (ctl->value <= 255)) {
|
||||
port->ctl_brightness = ctl->value;
|
||||
saa7164_api_set_usercontrol(port,
|
||||
PU_BRIGHTNESS_CONTROL);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
case V4L2_CID_CONTRAST:
|
||||
if ((ctl->value >= 0) && (ctl->value <= 255)) {
|
||||
port->ctl_contrast = ctl->value;
|
||||
saa7164_api_set_usercontrol(port, PU_CONTRAST_CONTROL);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
case V4L2_CID_SATURATION:
|
||||
if ((ctl->value >= 0) && (ctl->value <= 255)) {
|
||||
port->ctl_saturation = ctl->value;
|
||||
saa7164_api_set_usercontrol(port,
|
||||
PU_SATURATION_CONTROL);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
case V4L2_CID_HUE:
|
||||
if ((ctl->value >= 0) && (ctl->value <= 255)) {
|
||||
port->ctl_hue = ctl->value;
|
||||
saa7164_api_set_usercontrol(port, PU_HUE_CONTROL);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
case V4L2_CID_SHARPNESS:
|
||||
if ((ctl->value >= 0) && (ctl->value <= 255)) {
|
||||
port->ctl_sharpness = ctl->value;
|
||||
saa7164_api_set_usercontrol(port, PU_SHARPNESS_CONTROL);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
case V4L2_CID_AUDIO_VOLUME:
|
||||
if ((ctl->value >= -83) && (ctl->value <= 24)) {
|
||||
port->ctl_volume = ctl->value;
|
||||
saa7164_api_set_audio_volume(port, port->ctl_volume);
|
||||
} else
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
}
|
||||
int ret = saa7164_s_frequency(fh->port->enc_port, f);
|
||||
|
||||
if (ret == 0)
|
||||
saa7164_vbi_initialize(fh->port);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int saa7164_get_ctrl(struct saa7164_port *port,
|
||||
struct v4l2_ext_control *ctrl)
|
||||
{
|
||||
struct saa7164_vbi_params *params = &port->vbi_params;
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_MPEG_STREAM_TYPE:
|
||||
ctrl->value = params->stream_type;
|
||||
break;
|
||||
case V4L2_CID_MPEG_AUDIO_MUTE:
|
||||
ctrl->value = params->ctl_mute;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_ASPECT:
|
||||
ctrl->value = params->ctl_aspect;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_B_FRAMES:
|
||||
ctrl->value = params->refdist;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
|
||||
ctrl->value = params->gop_size;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_ext_ctrls(struct file *file, void *priv,
|
||||
struct v4l2_ext_controls *ctrls)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
int i, err = 0;
|
||||
|
||||
if (ctrls->ctrl_class == V4L2_CTRL_CLASS_MPEG) {
|
||||
for (i = 0; i < ctrls->count; i++) {
|
||||
struct v4l2_ext_control *ctrl = ctrls->controls + i;
|
||||
|
||||
err = saa7164_get_ctrl(port, ctrl);
|
||||
if (err) {
|
||||
ctrls->error_idx = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int saa7164_try_ctrl(struct v4l2_ext_control *ctrl, int ac3)
|
||||
{
|
||||
int ret = -EINVAL;
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_MPEG_STREAM_TYPE:
|
||||
if ((ctrl->value == V4L2_MPEG_STREAM_TYPE_MPEG2_PS) ||
|
||||
(ctrl->value == V4L2_MPEG_STREAM_TYPE_MPEG2_TS))
|
||||
ret = 0;
|
||||
break;
|
||||
case V4L2_CID_MPEG_AUDIO_MUTE:
|
||||
if ((ctrl->value >= 0) &&
|
||||
(ctrl->value <= 1))
|
||||
ret = 0;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_ASPECT:
|
||||
if ((ctrl->value >= V4L2_MPEG_VIDEO_ASPECT_1x1) &&
|
||||
(ctrl->value <= V4L2_MPEG_VIDEO_ASPECT_221x100))
|
||||
ret = 0;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
|
||||
if ((ctrl->value >= 0) &&
|
||||
(ctrl->value <= 255))
|
||||
ret = 0;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_B_FRAMES:
|
||||
if ((ctrl->value >= 1) &&
|
||||
(ctrl->value <= 3))
|
||||
ret = 0;
|
||||
break;
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int vidioc_try_ext_ctrls(struct file *file, void *priv,
|
||||
struct v4l2_ext_controls *ctrls)
|
||||
{
|
||||
int i, err = 0;
|
||||
|
||||
if (ctrls->ctrl_class == V4L2_CTRL_CLASS_MPEG) {
|
||||
for (i = 0; i < ctrls->count; i++) {
|
||||
struct v4l2_ext_control *ctrl = ctrls->controls + i;
|
||||
|
||||
err = saa7164_try_ctrl(ctrl, 0);
|
||||
if (err) {
|
||||
ctrls->error_idx = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int saa7164_set_ctrl(struct saa7164_port *port,
|
||||
struct v4l2_ext_control *ctrl)
|
||||
{
|
||||
struct saa7164_vbi_params *params = &port->vbi_params;
|
||||
int ret = 0;
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_MPEG_STREAM_TYPE:
|
||||
params->stream_type = ctrl->value;
|
||||
break;
|
||||
case V4L2_CID_MPEG_AUDIO_MUTE:
|
||||
params->ctl_mute = ctrl->value;
|
||||
ret = saa7164_api_audio_mute(port, params->ctl_mute);
|
||||
if (ret != SAA_OK) {
|
||||
printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__,
|
||||
ret);
|
||||
ret = -EIO;
|
||||
}
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_ASPECT:
|
||||
params->ctl_aspect = ctrl->value;
|
||||
ret = saa7164_api_set_aspect_ratio(port);
|
||||
if (ret != SAA_OK) {
|
||||
printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__,
|
||||
ret);
|
||||
ret = -EIO;
|
||||
}
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_B_FRAMES:
|
||||
params->refdist = ctrl->value;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
|
||||
params->gop_size = ctrl->value;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* TODO: Update the hardware */
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int vidioc_s_ext_ctrls(struct file *file, void *priv,
|
||||
struct v4l2_ext_controls *ctrls)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
int i, err = 0;
|
||||
|
||||
if (ctrls->ctrl_class == V4L2_CTRL_CLASS_MPEG) {
|
||||
for (i = 0; i < ctrls->count; i++) {
|
||||
struct v4l2_ext_control *ctrl = ctrls->controls + i;
|
||||
|
||||
err = saa7164_try_ctrl(ctrl, 0);
|
||||
if (err) {
|
||||
ctrls->error_idx = i;
|
||||
break;
|
||||
}
|
||||
err = saa7164_set_ctrl(port, ctrl);
|
||||
if (err) {
|
||||
ctrls->error_idx = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int vidioc_querycap(struct file *file, void *priv,
|
||||
struct v4l2_capability *cap)
|
||||
{
|
||||
@@ -672,144 +230,6 @@ static int vidioc_querycap(struct file *file, void *priv,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
|
||||
struct v4l2_fmtdesc *f)
|
||||
{
|
||||
if (f->index != 0)
|
||||
return -EINVAL;
|
||||
|
||||
strlcpy(f->description, "VBI", sizeof(f->description));
|
||||
f->pixelformat = V4L2_PIX_FMT_MPEG;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
|
||||
f->fmt.pix.bytesperline = 0;
|
||||
f->fmt.pix.sizeimage =
|
||||
port->ts_packet_size * port->ts_packet_count;
|
||||
f->fmt.pix.colorspace = 0;
|
||||
f->fmt.pix.width = port->width;
|
||||
f->fmt.pix.height = port->height;
|
||||
|
||||
dprintk(DBGLVL_VBI, "VIDIOC_G_FMT: w: %d, h: %d\n",
|
||||
port->width, port->height);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
|
||||
f->fmt.pix.bytesperline = 0;
|
||||
f->fmt.pix.sizeimage =
|
||||
port->ts_packet_size * port->ts_packet_count;
|
||||
f->fmt.pix.colorspace = 0;
|
||||
dprintk(DBGLVL_VBI, "VIDIOC_TRY_FMT: w: %d, h: %d\n",
|
||||
port->width, port->height);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = file->private_data;
|
||||
struct saa7164_port *port = fh->port;
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
|
||||
f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG;
|
||||
f->fmt.pix.bytesperline = 0;
|
||||
f->fmt.pix.sizeimage =
|
||||
port->ts_packet_size * port->ts_packet_count;
|
||||
f->fmt.pix.colorspace = 0;
|
||||
|
||||
dprintk(DBGLVL_VBI, "VIDIOC_S_FMT: w: %d, h: %d, f: %d\n",
|
||||
f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.field);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int fill_queryctrl(struct saa7164_vbi_params *params,
|
||||
struct v4l2_queryctrl *c)
|
||||
{
|
||||
switch (c->id) {
|
||||
case V4L2_CID_BRIGHTNESS:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 127);
|
||||
case V4L2_CID_CONTRAST:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 66);
|
||||
case V4L2_CID_SATURATION:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 62);
|
||||
case V4L2_CID_HUE:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 128);
|
||||
case V4L2_CID_SHARPNESS:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0x0f, 1, 8);
|
||||
case V4L2_CID_MPEG_AUDIO_MUTE:
|
||||
return v4l2_ctrl_query_fill(c, 0x0, 0x01, 1, 0);
|
||||
case V4L2_CID_AUDIO_VOLUME:
|
||||
return v4l2_ctrl_query_fill(c, -83, 24, 1, 20);
|
||||
case V4L2_CID_MPEG_STREAM_TYPE:
|
||||
return v4l2_ctrl_query_fill(c,
|
||||
V4L2_MPEG_STREAM_TYPE_MPEG2_PS,
|
||||
V4L2_MPEG_STREAM_TYPE_MPEG2_TS,
|
||||
1, V4L2_MPEG_STREAM_TYPE_MPEG2_PS);
|
||||
case V4L2_CID_MPEG_VIDEO_ASPECT:
|
||||
return v4l2_ctrl_query_fill(c,
|
||||
V4L2_MPEG_VIDEO_ASPECT_1x1,
|
||||
V4L2_MPEG_VIDEO_ASPECT_221x100,
|
||||
1, V4L2_MPEG_VIDEO_ASPECT_4x3);
|
||||
case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
|
||||
return v4l2_ctrl_query_fill(c, 1, 255, 1, 15);
|
||||
case V4L2_CID_MPEG_VIDEO_B_FRAMES:
|
||||
return v4l2_ctrl_query_fill(c,
|
||||
1, 3, 1, 1);
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
static int vidioc_queryctrl(struct file *file, void *priv,
|
||||
struct v4l2_queryctrl *c)
|
||||
{
|
||||
struct saa7164_vbi_fh *fh = priv;
|
||||
struct saa7164_port *port = fh->port;
|
||||
int i, next;
|
||||
u32 id = c->id;
|
||||
|
||||
memset(c, 0, sizeof(*c));
|
||||
|
||||
next = !!(id & V4L2_CTRL_FLAG_NEXT_CTRL);
|
||||
c->id = id & ~V4L2_CTRL_FLAG_NEXT_CTRL;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(saa7164_v4l2_ctrls); i++) {
|
||||
if (next) {
|
||||
if (c->id < saa7164_v4l2_ctrls[i])
|
||||
c->id = saa7164_v4l2_ctrls[i];
|
||||
else
|
||||
continue;
|
||||
}
|
||||
|
||||
if (c->id == saa7164_v4l2_ctrls[i])
|
||||
return fill_queryctrl(&port->vbi_params, c);
|
||||
|
||||
if (c->id < saa7164_v4l2_ctrls[i])
|
||||
break;
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int saa7164_vbi_stop_port(struct saa7164_port *port)
|
||||
{
|
||||
struct saa7164_dev *dev = port->dev;
|
||||
@@ -999,7 +419,6 @@ static int saa7164_vbi_fmt(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
/* ntsc */
|
||||
f->fmt.vbi.samples_per_line = 1600;
|
||||
f->fmt.vbi.samples_per_line = 1440;
|
||||
f->fmt.vbi.sampling_rate = 27000000;
|
||||
f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
|
||||
@@ -1009,6 +428,7 @@ static int saa7164_vbi_fmt(struct file *file, void *priv,
|
||||
f->fmt.vbi.count[0] = 18;
|
||||
f->fmt.vbi.start[1] = 263 + 10 + 1;
|
||||
f->fmt.vbi.count[1] = 18;
|
||||
memset(f->fmt.vbi.reserved, 0, sizeof(f->fmt.vbi.reserved));
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1031,8 +451,10 @@ static int fops_open(struct file *file)
|
||||
if (NULL == fh)
|
||||
return -ENOMEM;
|
||||
|
||||
file->private_data = fh;
|
||||
fh->port = port;
|
||||
v4l2_fh_init(&fh->fh, video_devdata(file));
|
||||
v4l2_fh_add(&fh->fh);
|
||||
file->private_data = fh;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -1053,7 +475,8 @@ static int fops_release(struct file *file)
|
||||
}
|
||||
}
|
||||
|
||||
file->private_data = NULL;
|
||||
v4l2_fh_del(&fh->fh);
|
||||
v4l2_fh_exit(&fh->fh);
|
||||
kfree(fh);
|
||||
|
||||
return 0;
|
||||
@@ -1248,24 +671,14 @@ static const struct v4l2_file_operations vbi_fops = {
|
||||
static const struct v4l2_ioctl_ops vbi_ioctl_ops = {
|
||||
.vidioc_s_std = vidioc_s_std,
|
||||
.vidioc_g_std = vidioc_g_std,
|
||||
.vidioc_enum_input = vidioc_enum_input,
|
||||
.vidioc_enum_input = saa7164_enum_input,
|
||||
.vidioc_g_input = vidioc_g_input,
|
||||
.vidioc_s_input = vidioc_s_input,
|
||||
.vidioc_g_tuner = vidioc_g_tuner,
|
||||
.vidioc_s_tuner = vidioc_s_tuner,
|
||||
.vidioc_g_tuner = saa7164_g_tuner,
|
||||
.vidioc_s_tuner = saa7164_s_tuner,
|
||||
.vidioc_g_frequency = vidioc_g_frequency,
|
||||
.vidioc_s_frequency = vidioc_s_frequency,
|
||||
.vidioc_s_ctrl = vidioc_s_ctrl,
|
||||
.vidioc_g_ctrl = vidioc_g_ctrl,
|
||||
.vidioc_querycap = vidioc_querycap,
|
||||
.vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
|
||||
.vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
|
||||
.vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
|
||||
.vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
|
||||
.vidioc_g_ext_ctrls = vidioc_g_ext_ctrls,
|
||||
.vidioc_s_ext_ctrls = vidioc_s_ext_ctrls,
|
||||
.vidioc_try_ext_ctrls = vidioc_try_ext_ctrls,
|
||||
.vidioc_queryctrl = vidioc_queryctrl,
|
||||
.vidioc_g_fmt_vbi_cap = saa7164_vbi_fmt,
|
||||
.vidioc_try_fmt_vbi_cap = saa7164_vbi_fmt,
|
||||
.vidioc_s_fmt_vbi_cap = saa7164_vbi_fmt,
|
||||
@@ -1335,7 +748,7 @@ int saa7164_vbi_register(struct saa7164_port *port)
|
||||
goto failed;
|
||||
}
|
||||
|
||||
port->std = V4L2_STD_NTSC_M;
|
||||
port->enc_port = &dev->ports[port->nr - 2];
|
||||
video_set_drvdata(port->v4l_device, port);
|
||||
result = video_register_device(port->v4l_device,
|
||||
VFL_TYPE_VBI, -1);
|
||||
|
@@ -54,8 +54,6 @@
|
||||
|
||||
#include <media/tuner.h>
|
||||
#include <media/tveeprom.h>
|
||||
#include <media/videobuf-dma-sg.h>
|
||||
#include <media/videobuf-dvb.h>
|
||||
#include <dvb_demux.h>
|
||||
#include <dvb_frontend.h>
|
||||
#include <dvb_net.h>
|
||||
@@ -64,6 +62,8 @@
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-event.h>
|
||||
|
||||
#include "saa7164-reg.h"
|
||||
#include "saa7164-types.h"
|
||||
@@ -117,7 +117,11 @@
|
||||
#define DBGLVL_CPU 8192
|
||||
|
||||
#define SAA7164_NORMS \
|
||||
(V4L2_STD_NTSC_M | V4L2_STD_NTSC_M_JP | V4L2_STD_NTSC_443)
|
||||
(V4L2_STD_NTSC_M | V4L2_STD_NTSC_M_JP)
|
||||
|
||||
/* TV frequency range copied from tuner-core.c */
|
||||
#define SAA7164_TV_MIN_FREQ (44U * 16U)
|
||||
#define SAA7164_TV_MAX_FREQ (958U * 16U)
|
||||
|
||||
enum port_t {
|
||||
SAA7164_MPEG_UNDEFINED = 0,
|
||||
@@ -185,11 +189,13 @@ struct saa7164_subid {
|
||||
};
|
||||
|
||||
struct saa7164_encoder_fh {
|
||||
struct v4l2_fh fh;
|
||||
struct saa7164_port *port;
|
||||
atomic_t v4l_reading;
|
||||
};
|
||||
|
||||
struct saa7164_vbi_fh {
|
||||
struct v4l2_fh fh;
|
||||
struct saa7164_port *port;
|
||||
atomic_t v4l_reading;
|
||||
};
|
||||
@@ -381,12 +387,11 @@ struct saa7164_port {
|
||||
/* Encoder */
|
||||
/* Defaults established in saa7164-encoder.c */
|
||||
struct saa7164_tvnorm encodernorm;
|
||||
struct v4l2_ctrl_handler ctrl_handler;
|
||||
v4l2_std_id std;
|
||||
u32 height;
|
||||
u32 width;
|
||||
u32 freq;
|
||||
u32 ts_packet_size;
|
||||
u32 ts_packet_count;
|
||||
u8 mux_input;
|
||||
u8 encoder_profile;
|
||||
u8 video_format;
|
||||
@@ -419,6 +424,7 @@ struct saa7164_port {
|
||||
/* V4L VBI */
|
||||
struct tmComResVBIFormatDescrHeader vbi_fmt_ntsc;
|
||||
struct saa7164_vbi_params vbi_params;
|
||||
struct saa7164_port *enc_port;
|
||||
|
||||
/* Debug */
|
||||
u32 sync_errors;
|
||||
@@ -594,6 +600,16 @@ extern int saa7164_buffer_zero_offsets(struct saa7164_port *port, int i);
|
||||
|
||||
/* ----------------------------------------------------------- */
|
||||
/* saa7164-encoder.c */
|
||||
int saa7164_s_std(struct saa7164_port *port, v4l2_std_id id);
|
||||
int saa7164_g_std(struct saa7164_port *port, v4l2_std_id *id);
|
||||
int saa7164_enum_input(struct file *file, void *priv, struct v4l2_input *i);
|
||||
int saa7164_g_input(struct saa7164_port *port, unsigned int *i);
|
||||
int saa7164_s_input(struct saa7164_port *port, unsigned int i);
|
||||
int saa7164_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t);
|
||||
int saa7164_s_tuner(struct file *file, void *priv, const struct v4l2_tuner *t);
|
||||
int saa7164_g_frequency(struct saa7164_port *port, struct v4l2_frequency *f);
|
||||
int saa7164_s_frequency(struct saa7164_port *port,
|
||||
const struct v4l2_frequency *f);
|
||||
int saa7164_encoder_register(struct saa7164_port *port);
|
||||
void saa7164_encoder_unregister(struct saa7164_port *port);
|
||||
|
||||
|
@@ -458,11 +458,12 @@ static inline u32 vop_usec(const vop_header *vh)
|
||||
static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
|
||||
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 sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
|
||||
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
|
||||
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)
|
||||
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);
|
||||
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),
|
||||
frame_size, SOLO_JPEG_EXT_ADDR(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,
|
||||
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 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 skip = 0;
|
||||
|
||||
@@ -488,15 +490,15 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
|
||||
return -EIO;
|
||||
|
||||
/* 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);
|
||||
if (!vop_type(vh)) {
|
||||
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) +
|
||||
solo_enc->vop_len);
|
||||
} 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));
|
||||
}
|
||||
|
||||
@@ -505,7 +507,7 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
|
||||
sizeof(*vh)) % SOLO_MP4E_EXT_SIZE(solo_dev);
|
||||
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_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,
|
||||
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;
|
||||
int ret;
|
||||
|
||||
@@ -527,17 +530,18 @@ static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
|
||||
}
|
||||
|
||||
if (!ret) {
|
||||
vb->v4l2_buf.sequence = solo_enc->sequence++;
|
||||
vb->v4l2_buf.timestamp.tv_sec = vop_sec(vh);
|
||||
vb->v4l2_buf.timestamp.tv_usec = vop_usec(vh);
|
||||
vbuf->sequence = solo_enc->sequence++;
|
||||
vbuf->timestamp.tv_sec = vop_sec(vh);
|
||||
vbuf->timestamp.tv_usec = vop_usec(vh);
|
||||
|
||||
/* Check for motion flags */
|
||||
if (solo_is_motion_on(solo_enc) && enc_buf->motion) {
|
||||
struct v4l2_event ev = {
|
||||
.type = V4L2_EVENT_MOTION_DET,
|
||||
.u.motion_det = {
|
||||
.flags = V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ,
|
||||
.frame_sequence = vb->v4l2_buf.sequence,
|
||||
.flags
|
||||
= V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ,
|
||||
.frame_sequence = vbuf->sequence,
|
||||
.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);
|
||||
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:
|
||||
mutex_unlock(&solo_enc->lock);
|
||||
}
|
||||
@@ -659,7 +663,7 @@ static int solo_ring_thread(void *data)
|
||||
}
|
||||
|
||||
static int solo_enc_queue_setup(struct vb2_queue *q,
|
||||
const struct v4l2_format *fmt,
|
||||
const void *parg,
|
||||
unsigned int *num_buffers,
|
||||
unsigned int *num_planes, unsigned int sizes[],
|
||||
void *alloc_ctxs[])
|
||||
@@ -678,10 +682,11 @@ static int solo_enc_queue_setup(struct vb2_queue *q,
|
||||
|
||||
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 solo_enc_dev *solo_enc = vb2_get_drv_priv(vq);
|
||||
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);
|
||||
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);
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
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 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) {
|
||||
case V4L2_PIX_FMT_MPEG4:
|
||||
case V4L2_PIX_FMT_H264:
|
||||
if (vb->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME)
|
||||
sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
|
||||
if (vbuf->flags & V4L2_BUF_FLAG_KEYFRAME)
|
||||
sg_copy_from_buffer(sgt->sgl, sgt->nents,
|
||||
solo_enc->vop, solo_enc->vop_len);
|
||||
break;
|
||||
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);
|
||||
break;
|
||||
}
|
||||
|
@@ -26,6 +26,7 @@
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-event.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.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,
|
||||
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;
|
||||
int error = -1;
|
||||
int i;
|
||||
|
||||
vbuf = vb2_dma_contig_plane_dma_addr(vb, 0);
|
||||
if (!vbuf)
|
||||
addr = vb2_dma_contig_plane_dma_addr(vb, 0);
|
||||
if (!addr)
|
||||
goto finish_buf;
|
||||
|
||||
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 *
|
||||
(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_vlines(solo_dev), SOLO_HW_BPL);
|
||||
}
|
||||
@@ -222,8 +224,8 @@ finish_buf:
|
||||
if (!error) {
|
||||
vb2_set_plane_payload(vb, 0,
|
||||
solo_vlines(solo_dev) * solo_bytesperline(solo_dev));
|
||||
vb->v4l2_buf.sequence = solo_dev->sequence++;
|
||||
v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
|
||||
vbuf->sequence = solo_dev->sequence++;
|
||||
v4l2_get_timestamp(&vbuf->timestamp);
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
solo_fillbuf(solo_dev, &vb->vb);
|
||||
solo_fillbuf(solo_dev, &vb->vb.vb2_buf);
|
||||
}
|
||||
|
||||
assert_spin_locked(&solo_dev->slock);
|
||||
@@ -311,7 +313,7 @@ static void solo_stop_thread(struct solo_dev *solo_dev)
|
||||
solo_dev->kthread = NULL;
|
||||
}
|
||||
|
||||
static int solo_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int solo_queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -345,10 +347,11 @@ static void solo_stop_streaming(struct vb2_queue *q)
|
||||
|
||||
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 solo_dev *solo_dev = vb2_get_drv_priv(vq);
|
||||
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);
|
||||
list_add_tail(&solo_vb->list, &solo_dev->vidq_active);
|
||||
|
@@ -35,7 +35,7 @@
|
||||
#include <media/v4l2-dev.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
#include "solo6x10-regs.h"
|
||||
|
||||
@@ -135,7 +135,7 @@ struct solo_p2m_dev {
|
||||
#define OSD_TEXT_MAX 44
|
||||
|
||||
struct solo_vb2_buf {
|
||||
struct vb2_buffer vb;
|
||||
struct vb2_v4l2_buffer vb;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
|
@@ -88,11 +88,11 @@
|
||||
|
||||
|
||||
struct vip_buffer {
|
||||
struct vb2_buffer vb;
|
||||
struct vb2_v4l2_buffer vb;
|
||||
struct list_head list;
|
||||
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);
|
||||
}
|
||||
@@ -265,7 +265,7 @@ static void vip_active_buf_next(struct sta2x11_vip *vip)
|
||||
|
||||
|
||||
/* Videobuf2 Operations */
|
||||
static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
|
||||
static int queue_setup(struct vb2_queue *vq, const void *parg,
|
||||
unsigned int *nbuffers, unsigned int *nplanes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
@@ -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)
|
||||
{
|
||||
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);
|
||||
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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
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;
|
||||
|
||||
size = vip->format.sizeimage;
|
||||
@@ -307,14 +309,15 @@ static int buffer_prepare(struct vb2_buffer *vb)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
vb2_set_plane_payload(&vip_buf->vb, 0, size);
|
||||
vb2_set_plane_payload(&vip_buf->vb.vb2_buf, 0, size);
|
||||
|
||||
return 0;
|
||||
}
|
||||
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 vip_buffer *vip_buf = to_vip_buffer(vb);
|
||||
struct vip_buffer *vip_buf = to_vip_buffer(vbuf);
|
||||
|
||||
spin_lock(&vip->lock);
|
||||
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)
|
||||
{
|
||||
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
|
||||
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 */
|
||||
spin_lock(&vip->lock);
|
||||
@@ -370,7 +374,7 @@ static void stop_streaming(struct vb2_queue *vq)
|
||||
/* Release all active buffers */
|
||||
spin_lock(&vip->lock);
|
||||
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);
|
||||
}
|
||||
spin_unlock(&vip->lock);
|
||||
@@ -813,9 +817,9 @@ static irqreturn_t vip_irq(int irq, struct sta2x11_vip *vip)
|
||||
/* Disable acquisition */
|
||||
reg_write(vip, DVP_CTL, reg_read(vip, DVP_CTL) & ~DVP_CTL_ENA);
|
||||
/* Remove the active buffer from the list */
|
||||
v4l2_get_timestamp(&vip->active->vb.v4l2_buf.timestamp);
|
||||
vip->active->vb.v4l2_buf.sequence = vip->sequence++;
|
||||
vb2_buffer_done(&vip->active->vb, VB2_BUF_STATE_DONE);
|
||||
v4l2_get_timestamp(&vip->active->vb.timestamp);
|
||||
vip->active->vb.sequence = vip->sequence++;
|
||||
vb2_buffer_done(&vip->active->vb.vb2_buf, VB2_BUF_STATE_DONE);
|
||||
}
|
||||
|
||||
return IRQ_HANDLED;
|
||||
|
@@ -303,7 +303,6 @@ static int arm_thread(void *data)
|
||||
static int DvbDmxFilterCallback(u8 *buffer1, size_t buffer1_len,
|
||||
u8 *buffer2, size_t buffer2_len,
|
||||
struct dvb_demux_filter *dvbdmxfilter,
|
||||
enum dmx_success success,
|
||||
struct av7110 *av7110)
|
||||
{
|
||||
if (!dvbdmxfilter->feed->demux->dmx.frontend)
|
||||
@@ -329,16 +328,14 @@ static int DvbDmxFilterCallback(u8 *buffer1, size_t buffer1_len,
|
||||
}
|
||||
return dvbdmxfilter->feed->cb.sec(buffer1, buffer1_len,
|
||||
buffer2, buffer2_len,
|
||||
&dvbdmxfilter->filter,
|
||||
DMX_OK);
|
||||
&dvbdmxfilter->filter);
|
||||
case DMX_TYPE_TS:
|
||||
if (!(dvbdmxfilter->feed->ts_type & TS_PACKET))
|
||||
return 0;
|
||||
if (dvbdmxfilter->feed->ts_type & TS_PAYLOAD_ONLY)
|
||||
return dvbdmxfilter->feed->cb.ts(buffer1, buffer1_len,
|
||||
buffer2, buffer2_len,
|
||||
&dvbdmxfilter->feed->feed.ts,
|
||||
DMX_OK);
|
||||
&dvbdmxfilter->feed->feed.ts);
|
||||
else
|
||||
av7110_p2t_write(buffer1, buffer1_len,
|
||||
dvbdmxfilter->feed->pid,
|
||||
@@ -422,7 +419,7 @@ static void debiirq(unsigned long cookie)
|
||||
DvbDmxFilterCallback((u8 *)av7110->debi_virt,
|
||||
av7110->debilen, NULL, 0,
|
||||
av7110->handle2filter[handle],
|
||||
DMX_OK, av7110);
|
||||
av7110);
|
||||
xfer = RX_BUFF;
|
||||
break;
|
||||
|
||||
|
@@ -102,7 +102,7 @@ int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len)
|
||||
buf[4] = buf[5] = 0;
|
||||
if (dvbdmxfeed->ts_type & TS_PAYLOAD_ONLY)
|
||||
return dvbdmxfeed->cb.ts(buf, len, NULL, 0,
|
||||
&dvbdmxfeed->feed.ts, DMX_OK);
|
||||
&dvbdmxfeed->feed.ts);
|
||||
else
|
||||
return dvb_filter_pes2ts(p2t, buf, len, 1);
|
||||
}
|
||||
@@ -112,7 +112,7 @@ static int dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
|
||||
struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) priv;
|
||||
|
||||
dvbdmxfeed->cb.ts(data, 188, NULL, 0,
|
||||
&dvbdmxfeed->feed.ts, DMX_OK);
|
||||
&dvbdmxfeed->feed.ts);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -815,7 +815,7 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter,
|
||||
memcpy(obuf + l, buf + c, TS_SIZE - l);
|
||||
c = length;
|
||||
}
|
||||
feed->cb.ts(obuf, 188, NULL, 0, &feed->feed.ts, DMX_OK);
|
||||
feed->cb.ts(obuf, 188, NULL, 0, &feed->feed.ts);
|
||||
pes_start = 0;
|
||||
}
|
||||
}
|
||||
|
@@ -376,10 +376,11 @@ static int tw68_buffer_count(unsigned int size, unsigned int count)
|
||||
/* ------------------------------------------------------------- */
|
||||
/* vb2 queue operations */
|
||||
|
||||
static int tw68_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
static int tw68_queue_setup(struct vb2_queue *q, const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
const struct v4l2_format *fmt = parg;
|
||||
struct tw68_dev *dev = vb2_get_drv_priv(q);
|
||||
unsigned tot_bufs = q->num_buffers + *num_buffers;
|
||||
|
||||
@@ -423,9 +424,10 @@ static int tw68_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||
*/
|
||||
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 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;
|
||||
unsigned long flags;
|
||||
|
||||
@@ -457,9 +459,10 @@ static void tw68_buf_queue(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 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);
|
||||
unsigned size, bpl;
|
||||
|
||||
@@ -499,9 +502,10 @@ static int tw68_buf_prepare(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 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);
|
||||
}
|
||||
@@ -528,7 +532,7 @@ static void tw68_stop_streaming(struct vb2_queue *q)
|
||||
container_of(dev->active.next, struct tw68_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 +1016,10 @@ void tw68_irq_video_done(struct tw68_dev *dev, unsigned long status)
|
||||
buf = list_entry(dev->active.next, struct tw68_buf, list);
|
||||
list_del(&buf->list);
|
||||
spin_unlock(&dev->slock);
|
||||
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
|
||||
buf->vb.v4l2_buf.field = dev->field;
|
||||
buf->vb.v4l2_buf.sequence = dev->seqnr++;
|
||||
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
|
||||
v4l2_get_timestamp(&buf->vb.timestamp);
|
||||
buf->vb.field = dev->field;
|
||||
buf->vb.sequence = dev->seqnr++;
|
||||
vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
|
||||
status &= ~(TW68_DMAPI);
|
||||
if (0 == status)
|
||||
return;
|
||||
|
@@ -36,6 +36,7 @@
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-sg.h>
|
||||
|
||||
#include "tw68-reg.h"
|
||||
@@ -118,7 +119,7 @@ struct tw68_dev; /* forward delclaration */
|
||||
|
||||
/* buffer for one video/vbi/ts frame */
|
||||
struct tw68_buf {
|
||||
struct vb2_buffer vb;
|
||||
struct vb2_v4l2_buffer vb;
|
||||
struct list_head list;
|
||||
|
||||
unsigned int size;
|
||||
|
Viittaa uudesa ongelmassa
Block a user