Commit 165d0043 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] cx88: add missing alloc_ctx support

The cx88 vb2 conversion and the vb2 dma_sg improvements were developed separately and
were merged separately. Unfortunately, the patch updating drivers to the dma_sg
improvements didn't take the updated cx88 driver into account. Basically two ships
passing in the night, unaware of one another even though both ships have the same
owner, i.e. me :-)
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reported-by: default avatarChris Lee <updatelee@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 454a4e72
...@@ -647,6 +647,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt, ...@@ -647,6 +647,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
dev->ts_packet_size = 188 * 4; dev->ts_packet_size = 188 * 4;
dev->ts_packet_count = 32; dev->ts_packet_count = 32;
sizes[0] = dev->ts_packet_size * dev->ts_packet_count; sizes[0] = dev->ts_packet_size * dev->ts_packet_count;
alloc_ctxs[0] = dev->alloc_ctx;
return 0; return 0;
} }
...@@ -662,14 +663,11 @@ static void buffer_finish(struct vb2_buffer *vb) ...@@ -662,14 +663,11 @@ static void buffer_finish(struct vb2_buffer *vb)
{ {
struct cx8802_dev *dev = vb->vb2_queue->drv_priv; struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
struct cx88_riscmem *risc = &buf->risc; struct cx88_riscmem *risc = &buf->risc;
if (risc->cpu) if (risc->cpu)
pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma); pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma);
memset(risc, 0, sizeof(*risc)); memset(risc, 0, sizeof(*risc));
dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
} }
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
......
...@@ -92,6 +92,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt, ...@@ -92,6 +92,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
dev->ts_packet_size = 188 * 4; dev->ts_packet_size = 188 * 4;
dev->ts_packet_count = dvb_buf_tscnt; dev->ts_packet_count = dvb_buf_tscnt;
sizes[0] = dev->ts_packet_size * dev->ts_packet_count; sizes[0] = dev->ts_packet_size * dev->ts_packet_count;
alloc_ctxs[0] = dev->alloc_ctx;
*num_buffers = dvb_buf_tscnt; *num_buffers = dvb_buf_tscnt;
return 0; return 0;
} }
...@@ -108,14 +109,11 @@ static void buffer_finish(struct vb2_buffer *vb) ...@@ -108,14 +109,11 @@ static void buffer_finish(struct vb2_buffer *vb)
{ {
struct cx8802_dev *dev = vb->vb2_queue->drv_priv; struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
struct cx88_riscmem *risc = &buf->risc; struct cx88_riscmem *risc = &buf->risc;
if (risc->cpu) if (risc->cpu)
pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma); pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma);
memset(risc, 0, sizeof(*risc)); memset(risc, 0, sizeof(*risc));
dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
} }
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
......
...@@ -235,10 +235,6 @@ int cx8802_buf_prepare(struct vb2_queue *q, struct cx8802_dev *dev, ...@@ -235,10 +235,6 @@ int cx8802_buf_prepare(struct vb2_queue *q, struct cx8802_dev *dev,
return -EINVAL; return -EINVAL;
vb2_set_plane_payload(&buf->vb, 0, size); vb2_set_plane_payload(&buf->vb, 0, size);
rc = dma_map_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
if (!rc)
return -EIO;
rc = cx88_risc_databuffer(dev->pci, risc, sgt->sgl, rc = cx88_risc_databuffer(dev->pci, risc, sgt->sgl,
dev->ts_packet_size, dev->ts_packet_count, 0); dev->ts_packet_size, dev->ts_packet_count, 0);
if (rc) { if (rc) {
...@@ -733,6 +729,11 @@ static int cx8802_probe(struct pci_dev *pci_dev, ...@@ -733,6 +729,11 @@ static int cx8802_probe(struct pci_dev *pci_dev,
if (NULL == dev) if (NULL == dev)
goto fail_core; goto fail_core;
dev->pci = pci_dev; dev->pci = pci_dev;
dev->alloc_ctx = vb2_dma_sg_init_ctx(&pci_dev->dev);
if (IS_ERR(dev->alloc_ctx)) {
err = PTR_ERR(dev->alloc_ctx);
goto fail_core;
}
dev->core = core; dev->core = core;
/* Maintain a reference so cx88-video can query the 8802 device. */ /* Maintain a reference so cx88-video can query the 8802 device. */
...@@ -752,6 +753,7 @@ static int cx8802_probe(struct pci_dev *pci_dev, ...@@ -752,6 +753,7 @@ static int cx8802_probe(struct pci_dev *pci_dev,
return 0; return 0;
fail_free: fail_free:
vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
kfree(dev); kfree(dev);
fail_core: fail_core:
core->dvbdev = NULL; core->dvbdev = NULL;
...@@ -798,6 +800,7 @@ static void cx8802_remove(struct pci_dev *pci_dev) ...@@ -798,6 +800,7 @@ static void cx8802_remove(struct pci_dev *pci_dev)
/* common */ /* common */
cx8802_fini_common(dev); cx8802_fini_common(dev);
cx88_core_put(dev->core,dev->pci); cx88_core_put(dev->core,dev->pci);
vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
kfree(dev); kfree(dev);
} }
......
...@@ -120,6 +120,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt, ...@@ -120,6 +120,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
sizes[0] = VBI_LINE_NTSC_COUNT * VBI_LINE_LENGTH * 2; sizes[0] = VBI_LINE_NTSC_COUNT * VBI_LINE_LENGTH * 2;
else else
sizes[0] = VBI_LINE_PAL_COUNT * VBI_LINE_LENGTH * 2; sizes[0] = VBI_LINE_PAL_COUNT * VBI_LINE_LENGTH * 2;
alloc_ctxs[0] = dev->alloc_ctx;
return 0; return 0;
} }
...@@ -131,7 +132,6 @@ static int buffer_prepare(struct vb2_buffer *vb) ...@@ -131,7 +132,6 @@ static int buffer_prepare(struct vb2_buffer *vb)
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
unsigned int lines; unsigned int lines;
unsigned int size; unsigned int size;
int rc;
if (dev->core->tvnorm & V4L2_STD_525_60) if (dev->core->tvnorm & V4L2_STD_525_60)
lines = VBI_LINE_NTSC_COUNT; lines = VBI_LINE_NTSC_COUNT;
...@@ -142,10 +142,6 @@ static int buffer_prepare(struct vb2_buffer *vb) ...@@ -142,10 +142,6 @@ static int buffer_prepare(struct vb2_buffer *vb)
return -EINVAL; return -EINVAL;
vb2_set_plane_payload(vb, 0, size); vb2_set_plane_payload(vb, 0, size);
rc = dma_map_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
if (!rc)
return -EIO;
cx88_risc_buffer(dev->pci, &buf->risc, sgt->sgl, cx88_risc_buffer(dev->pci, &buf->risc, sgt->sgl,
0, VBI_LINE_LENGTH * lines, 0, VBI_LINE_LENGTH * lines,
VBI_LINE_LENGTH, 0, VBI_LINE_LENGTH, 0,
...@@ -157,14 +153,11 @@ static void buffer_finish(struct vb2_buffer *vb) ...@@ -157,14 +153,11 @@ static void buffer_finish(struct vb2_buffer *vb)
{ {
struct cx8800_dev *dev = vb->vb2_queue->drv_priv; struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
struct cx88_riscmem *risc = &buf->risc; struct cx88_riscmem *risc = &buf->risc;
if (risc->cpu) if (risc->cpu)
pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma); pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma);
memset(risc, 0, sizeof(*risc)); memset(risc, 0, sizeof(*risc));
dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
} }
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
......
...@@ -440,6 +440,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt, ...@@ -440,6 +440,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
*num_planes = 1; *num_planes = 1;
sizes[0] = (dev->fmt->depth * core->width * core->height) >> 3; sizes[0] = (dev->fmt->depth * core->width * core->height) >> 3;
alloc_ctxs[0] = dev->alloc_ctx;
return 0; return 0;
} }
...@@ -449,7 +450,6 @@ static int buffer_prepare(struct vb2_buffer *vb) ...@@ -449,7 +450,6 @@ static int buffer_prepare(struct vb2_buffer *vb)
struct cx88_core *core = dev->core; struct cx88_core *core = dev->core;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0); struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
int rc;
buf->bpl = core->width * dev->fmt->depth >> 3; buf->bpl = core->width * dev->fmt->depth >> 3;
...@@ -457,10 +457,6 @@ static int buffer_prepare(struct vb2_buffer *vb) ...@@ -457,10 +457,6 @@ static int buffer_prepare(struct vb2_buffer *vb)
return -EINVAL; return -EINVAL;
vb2_set_plane_payload(vb, 0, core->height * buf->bpl); vb2_set_plane_payload(vb, 0, core->height * buf->bpl);
rc = dma_map_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
if (!rc)
return -EIO;
switch (core->field) { switch (core->field) {
case V4L2_FIELD_TOP: case V4L2_FIELD_TOP:
cx88_risc_buffer(dev->pci, &buf->risc, cx88_risc_buffer(dev->pci, &buf->risc,
...@@ -505,14 +501,11 @@ static void buffer_finish(struct vb2_buffer *vb) ...@@ -505,14 +501,11 @@ static void buffer_finish(struct vb2_buffer *vb)
{ {
struct cx8800_dev *dev = vb->vb2_queue->drv_priv; struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb); struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
struct cx88_riscmem *risc = &buf->risc; struct cx88_riscmem *risc = &buf->risc;
if (risc->cpu) if (risc->cpu)
pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma); pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma);
memset(risc, 0, sizeof(*risc)); memset(risc, 0, sizeof(*risc));
dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
} }
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
...@@ -1345,6 +1338,12 @@ static int cx8800_initdev(struct pci_dev *pci_dev, ...@@ -1345,6 +1338,12 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
err = -EIO; err = -EIO;
goto fail_core; goto fail_core;
} }
dev->alloc_ctx = vb2_dma_sg_init_ctx(&pci_dev->dev);
if (IS_ERR(dev->alloc_ctx)) {
err = PTR_ERR(dev->alloc_ctx);
goto fail_core;
}
/* initialize driver struct */ /* initialize driver struct */
spin_lock_init(&dev->slock); spin_lock_init(&dev->slock);
...@@ -1549,6 +1548,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, ...@@ -1549,6 +1548,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
free_irq(pci_dev->irq, dev); free_irq(pci_dev->irq, dev);
mutex_unlock(&core->lock); mutex_unlock(&core->lock);
fail_core: fail_core:
vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
core->v4ldev = NULL; core->v4ldev = NULL;
cx88_core_put(core,dev->pci); cx88_core_put(core,dev->pci);
fail_free: fail_free:
...@@ -1582,6 +1582,7 @@ static void cx8800_finidev(struct pci_dev *pci_dev) ...@@ -1582,6 +1582,7 @@ static void cx8800_finidev(struct pci_dev *pci_dev)
/* free memory */ /* free memory */
cx88_core_put(core,dev->pci); cx88_core_put(core,dev->pci);
vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
kfree(dev); kfree(dev);
} }
......
...@@ -485,6 +485,7 @@ struct cx8800_dev { ...@@ -485,6 +485,7 @@ struct cx8800_dev {
/* pci i/o */ /* pci i/o */
struct pci_dev *pci; struct pci_dev *pci;
unsigned char pci_rev,pci_lat; unsigned char pci_rev,pci_lat;
void *alloc_ctx;
const struct cx8800_fmt *fmt; const struct cx8800_fmt *fmt;
...@@ -548,6 +549,7 @@ struct cx8802_dev { ...@@ -548,6 +549,7 @@ struct cx8802_dev {
/* pci i/o */ /* pci i/o */
struct pci_dev *pci; struct pci_dev *pci;
unsigned char pci_rev,pci_lat; unsigned char pci_rev,pci_lat;
void *alloc_ctx;
/* dma queues */ /* dma queues */
struct cx88_dmaqueue mpegq; struct cx88_dmaqueue mpegq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment