[media] vb2-dma-sg: add allocation context to dma-sg
Require that dma-sg also uses an allocation context. This is in preparation for adding prepare/finish memops to sync the memory between DMA and CPU. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Pawel Osciak <pawel@osciak.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
e5ae8fa739
commit
0c3a14c177
|
@ -1148,6 +1148,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||||
dev->ts1.ts_packet_count = mpeglines;
|
dev->ts1.ts_packet_count = mpeglines;
|
||||||
*num_planes = 1;
|
*num_planes = 1;
|
||||||
sizes[0] = mpeglinesize * mpeglines;
|
sizes[0] = mpeglinesize * mpeglines;
|
||||||
|
alloc_ctxs[0] = dev->alloc_ctx;
|
||||||
*num_buffers = mpegbufs;
|
*num_buffers = mpegbufs;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1997,9 +1997,14 @@ static int cx23885_initdev(struct pci_dev *pci_dev,
|
||||||
if (!pci_dma_supported(pci_dev, 0xffffffff)) {
|
if (!pci_dma_supported(pci_dev, 0xffffffff)) {
|
||||||
printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
|
printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
|
||||||
err = -EIO;
|
err = -EIO;
|
||||||
goto fail_irq;
|
goto fail_context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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_context;
|
||||||
|
}
|
||||||
err = request_irq(pci_dev->irq, cx23885_irq,
|
err = request_irq(pci_dev->irq, cx23885_irq,
|
||||||
IRQF_SHARED, dev->name, dev);
|
IRQF_SHARED, dev->name, dev);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
|
@ -2028,6 +2033,8 @@ static int cx23885_initdev(struct pci_dev *pci_dev,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail_irq:
|
fail_irq:
|
||||||
|
vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
|
||||||
|
fail_context:
|
||||||
cx23885_dev_unregister(dev);
|
cx23885_dev_unregister(dev);
|
||||||
fail_ctrl:
|
fail_ctrl:
|
||||||
v4l2_ctrl_handler_free(hdl);
|
v4l2_ctrl_handler_free(hdl);
|
||||||
|
@ -2053,6 +2060,7 @@ static void cx23885_finidev(struct pci_dev *pci_dev)
|
||||||
free_irq(pci_dev->irq, dev);
|
free_irq(pci_dev->irq, dev);
|
||||||
|
|
||||||
cx23885_dev_unregister(dev);
|
cx23885_dev_unregister(dev);
|
||||||
|
vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
|
||||||
v4l2_ctrl_handler_free(&dev->ctrl_handler);
|
v4l2_ctrl_handler_free(&dev->ctrl_handler);
|
||||||
v4l2_device_unregister(v4l2_dev);
|
v4l2_device_unregister(v4l2_dev);
|
||||||
kfree(dev);
|
kfree(dev);
|
||||||
|
|
|
@ -102,6 +102,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||||
port->ts_packet_count = 32;
|
port->ts_packet_count = 32;
|
||||||
*num_planes = 1;
|
*num_planes = 1;
|
||||||
sizes[0] = port->ts_packet_size * port->ts_packet_count;
|
sizes[0] = port->ts_packet_size * port->ts_packet_count;
|
||||||
|
alloc_ctxs[0] = port->dev->alloc_ctx;
|
||||||
*num_buffers = 32;
|
*num_buffers = 32;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -132,6 +132,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||||
lines = VBI_NTSC_LINE_COUNT;
|
lines = VBI_NTSC_LINE_COUNT;
|
||||||
*num_planes = 1;
|
*num_planes = 1;
|
||||||
sizes[0] = lines * VBI_LINE_LENGTH * 2;
|
sizes[0] = lines * VBI_LINE_LENGTH * 2;
|
||||||
|
alloc_ctxs[0] = dev->alloc_ctx;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -323,6 +323,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 * dev->width * dev->height) >> 3;
|
sizes[0] = (dev->fmt->depth * dev->width * dev->height) >> 3;
|
||||||
|
alloc_ctxs[0] = dev->alloc_ctx;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -425,6 +425,7 @@ struct cx23885_dev {
|
||||||
struct vb2_queue vb2_vidq;
|
struct vb2_queue vb2_vidq;
|
||||||
struct cx23885_dmaqueue vbiq;
|
struct cx23885_dmaqueue vbiq;
|
||||||
struct vb2_queue vb2_vbiq;
|
struct vb2_queue vb2_vbiq;
|
||||||
|
void *alloc_ctx;
|
||||||
|
|
||||||
spinlock_t slock;
|
spinlock_t slock;
|
||||||
|
|
||||||
|
|
|
@ -1001,13 +1001,18 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
|
||||||
saa7134_board_init1(dev);
|
saa7134_board_init1(dev);
|
||||||
saa7134_hwinit1(dev);
|
saa7134_hwinit1(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 fail3;
|
||||||
|
}
|
||||||
/* get irq */
|
/* get irq */
|
||||||
err = request_irq(pci_dev->irq, saa7134_irq,
|
err = request_irq(pci_dev->irq, saa7134_irq,
|
||||||
IRQF_SHARED, dev->name, dev);
|
IRQF_SHARED, dev->name, dev);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
printk(KERN_ERR "%s: can't get IRQ %d\n",
|
printk(KERN_ERR "%s: can't get IRQ %d\n",
|
||||||
dev->name,pci_dev->irq);
|
dev->name,pci_dev->irq);
|
||||||
goto fail3;
|
goto fail4;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* wait a bit, register i2c bus */
|
/* wait a bit, register i2c bus */
|
||||||
|
@ -1065,7 +1070,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
printk(KERN_INFO "%s: can't register video device\n",
|
printk(KERN_INFO "%s: can't register video device\n",
|
||||||
dev->name);
|
dev->name);
|
||||||
goto fail4;
|
goto fail5;
|
||||||
}
|
}
|
||||||
printk(KERN_INFO "%s: registered device %s [v4l2]\n",
|
printk(KERN_INFO "%s: registered device %s [v4l2]\n",
|
||||||
dev->name, video_device_node_name(dev->video_dev));
|
dev->name, video_device_node_name(dev->video_dev));
|
||||||
|
@ -1078,7 +1083,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
|
||||||
err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI,
|
err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI,
|
||||||
vbi_nr[dev->nr]);
|
vbi_nr[dev->nr]);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto fail4;
|
goto fail5;
|
||||||
printk(KERN_INFO "%s: registered device %s\n",
|
printk(KERN_INFO "%s: registered device %s\n",
|
||||||
dev->name, video_device_node_name(dev->vbi_dev));
|
dev->name, video_device_node_name(dev->vbi_dev));
|
||||||
|
|
||||||
|
@ -1089,7 +1094,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
|
||||||
err = video_register_device(dev->radio_dev,VFL_TYPE_RADIO,
|
err = video_register_device(dev->radio_dev,VFL_TYPE_RADIO,
|
||||||
radio_nr[dev->nr]);
|
radio_nr[dev->nr]);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto fail4;
|
goto fail5;
|
||||||
printk(KERN_INFO "%s: registered device %s\n",
|
printk(KERN_INFO "%s: registered device %s\n",
|
||||||
dev->name, video_device_node_name(dev->radio_dev));
|
dev->name, video_device_node_name(dev->radio_dev));
|
||||||
}
|
}
|
||||||
|
@ -1103,10 +1108,12 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
|
||||||
request_submodules(dev);
|
request_submodules(dev);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail4:
|
fail5:
|
||||||
saa7134_unregister_video(dev);
|
saa7134_unregister_video(dev);
|
||||||
saa7134_i2c_unregister(dev);
|
saa7134_i2c_unregister(dev);
|
||||||
free_irq(pci_dev->irq, dev);
|
free_irq(pci_dev->irq, dev);
|
||||||
|
fail4:
|
||||||
|
vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
|
||||||
fail3:
|
fail3:
|
||||||
saa7134_hwfini(dev);
|
saa7134_hwfini(dev);
|
||||||
iounmap(dev->lmmio);
|
iounmap(dev->lmmio);
|
||||||
|
@ -1173,6 +1180,7 @@ static void saa7134_finidev(struct pci_dev *pci_dev)
|
||||||
|
|
||||||
/* release resources */
|
/* release resources */
|
||||||
free_irq(pci_dev->irq, dev);
|
free_irq(pci_dev->irq, dev);
|
||||||
|
vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
|
||||||
iounmap(dev->lmmio);
|
iounmap(dev->lmmio);
|
||||||
release_mem_region(pci_resource_start(pci_dev,0),
|
release_mem_region(pci_resource_start(pci_dev,0),
|
||||||
pci_resource_len(pci_dev,0));
|
pci_resource_len(pci_dev,0));
|
||||||
|
|
|
@ -142,6 +142,7 @@ int saa7134_ts_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||||
*nbuffers = 3;
|
*nbuffers = 3;
|
||||||
*nplanes = 1;
|
*nplanes = 1;
|
||||||
sizes[0] = size;
|
sizes[0] = size;
|
||||||
|
alloc_ctxs[0] = dev->alloc_ctx;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(saa7134_ts_queue_setup);
|
EXPORT_SYMBOL_GPL(saa7134_ts_queue_setup);
|
||||||
|
|
|
@ -156,6 +156,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||||
*nbuffers = saa7134_buffer_count(size, *nbuffers);
|
*nbuffers = saa7134_buffer_count(size, *nbuffers);
|
||||||
*nplanes = 1;
|
*nplanes = 1;
|
||||||
sizes[0] = size;
|
sizes[0] = size;
|
||||||
|
alloc_ctxs[0] = dev->alloc_ctx;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -932,6 +932,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||||
*nbuffers = saa7134_buffer_count(size, *nbuffers);
|
*nbuffers = saa7134_buffer_count(size, *nbuffers);
|
||||||
*nplanes = 1;
|
*nplanes = 1;
|
||||||
sizes[0] = size;
|
sizes[0] = size;
|
||||||
|
alloc_ctxs[0] = dev->alloc_ctx;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -588,6 +588,7 @@ struct saa7134_dev {
|
||||||
|
|
||||||
|
|
||||||
/* video+ts+vbi capture */
|
/* video+ts+vbi capture */
|
||||||
|
void *alloc_ctx;
|
||||||
struct saa7134_dmaqueue video_q;
|
struct saa7134_dmaqueue video_q;
|
||||||
struct vb2_queue video_vbq;
|
struct vb2_queue video_vbq;
|
||||||
struct saa7134_dmaqueue vbi_q;
|
struct saa7134_dmaqueue vbi_q;
|
||||||
|
|
|
@ -718,7 +718,10 @@ static int solo_enc_queue_setup(struct vb2_queue *q,
|
||||||
unsigned int *num_planes, unsigned int sizes[],
|
unsigned int *num_planes, unsigned int sizes[],
|
||||||
void *alloc_ctxs[])
|
void *alloc_ctxs[])
|
||||||
{
|
{
|
||||||
|
struct solo_enc_dev *solo_enc = vb2_get_drv_priv(q);
|
||||||
|
|
||||||
sizes[0] = FRAME_BUF_SIZE;
|
sizes[0] = FRAME_BUF_SIZE;
|
||||||
|
alloc_ctxs[0] = solo_enc->alloc_ctx;
|
||||||
*num_planes = 1;
|
*num_planes = 1;
|
||||||
|
|
||||||
if (*num_buffers < MIN_VID_BUFFERS)
|
if (*num_buffers < MIN_VID_BUFFERS)
|
||||||
|
@ -1266,6 +1269,11 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
|
||||||
return ERR_PTR(-ENOMEM);
|
return ERR_PTR(-ENOMEM);
|
||||||
|
|
||||||
hdl = &solo_enc->hdl;
|
hdl = &solo_enc->hdl;
|
||||||
|
solo_enc->alloc_ctx = vb2_dma_sg_init_ctx(&solo_dev->pdev->dev);
|
||||||
|
if (IS_ERR(solo_enc->alloc_ctx)) {
|
||||||
|
ret = PTR_ERR(solo_enc->alloc_ctx);
|
||||||
|
goto hdl_free;
|
||||||
|
}
|
||||||
v4l2_ctrl_handler_init(hdl, 10);
|
v4l2_ctrl_handler_init(hdl, 10);
|
||||||
v4l2_ctrl_new_std(hdl, &solo_ctrl_ops,
|
v4l2_ctrl_new_std(hdl, &solo_ctrl_ops,
|
||||||
V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);
|
V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);
|
||||||
|
@ -1369,6 +1377,7 @@ pci_free:
|
||||||
solo_enc->desc_items, solo_enc->desc_dma);
|
solo_enc->desc_items, solo_enc->desc_dma);
|
||||||
hdl_free:
|
hdl_free:
|
||||||
v4l2_ctrl_handler_free(hdl);
|
v4l2_ctrl_handler_free(hdl);
|
||||||
|
vb2_dma_sg_cleanup_ctx(solo_enc->alloc_ctx);
|
||||||
kfree(solo_enc);
|
kfree(solo_enc);
|
||||||
return ERR_PTR(ret);
|
return ERR_PTR(ret);
|
||||||
}
|
}
|
||||||
|
@ -1383,6 +1392,7 @@ static void solo_enc_free(struct solo_enc_dev *solo_enc)
|
||||||
solo_enc->desc_items, solo_enc->desc_dma);
|
solo_enc->desc_items, solo_enc->desc_dma);
|
||||||
video_unregister_device(solo_enc->vfd);
|
video_unregister_device(solo_enc->vfd);
|
||||||
v4l2_ctrl_handler_free(&solo_enc->hdl);
|
v4l2_ctrl_handler_free(&solo_enc->hdl);
|
||||||
|
vb2_dma_sg_cleanup_ctx(solo_enc->alloc_ctx);
|
||||||
kfree(solo_enc);
|
kfree(solo_enc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -180,6 +180,7 @@ struct solo_enc_dev {
|
||||||
u32 sequence;
|
u32 sequence;
|
||||||
struct vb2_queue vidq;
|
struct vb2_queue vidq;
|
||||||
struct list_head vidq_active;
|
struct list_head vidq_active;
|
||||||
|
void *alloc_ctx;
|
||||||
int desc_count;
|
int desc_count;
|
||||||
int desc_nelts;
|
int desc_nelts;
|
||||||
struct solo_p2m_desc *desc_items;
|
struct solo_p2m_desc *desc_items;
|
||||||
|
|
|
@ -304,13 +304,19 @@ static int tw68_initdev(struct pci_dev *pci_dev,
|
||||||
/* Then do any initialisation wanted before interrupts are on */
|
/* Then do any initialisation wanted before interrupts are on */
|
||||||
tw68_hw_init1(dev);
|
tw68_hw_init1(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 fail3;
|
||||||
|
}
|
||||||
|
|
||||||
/* get irq */
|
/* get irq */
|
||||||
err = devm_request_irq(&pci_dev->dev, pci_dev->irq, tw68_irq,
|
err = devm_request_irq(&pci_dev->dev, pci_dev->irq, tw68_irq,
|
||||||
IRQF_SHARED, dev->name, dev);
|
IRQF_SHARED, dev->name, dev);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
pr_err("%s: can't get IRQ %d\n",
|
pr_err("%s: can't get IRQ %d\n",
|
||||||
dev->name, pci_dev->irq);
|
dev->name, pci_dev->irq);
|
||||||
goto fail3;
|
goto fail4;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -324,7 +330,7 @@ static int tw68_initdev(struct pci_dev *pci_dev,
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
pr_err("%s: can't register video device\n",
|
pr_err("%s: can't register video device\n",
|
||||||
dev->name);
|
dev->name);
|
||||||
goto fail4;
|
goto fail5;
|
||||||
}
|
}
|
||||||
tw_setl(TW68_INTMASK, dev->pci_irqmask);
|
tw_setl(TW68_INTMASK, dev->pci_irqmask);
|
||||||
|
|
||||||
|
@ -333,8 +339,10 @@ static int tw68_initdev(struct pci_dev *pci_dev,
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail4:
|
fail5:
|
||||||
video_unregister_device(&dev->vdev);
|
video_unregister_device(&dev->vdev);
|
||||||
|
fail4:
|
||||||
|
vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
|
||||||
fail3:
|
fail3:
|
||||||
iounmap(dev->lmmio);
|
iounmap(dev->lmmio);
|
||||||
fail2:
|
fail2:
|
||||||
|
@ -358,6 +366,7 @@ static void tw68_finidev(struct pci_dev *pci_dev)
|
||||||
/* unregister */
|
/* unregister */
|
||||||
video_unregister_device(&dev->vdev);
|
video_unregister_device(&dev->vdev);
|
||||||
v4l2_ctrl_handler_free(&dev->hdl);
|
v4l2_ctrl_handler_free(&dev->hdl);
|
||||||
|
vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
|
||||||
|
|
||||||
/* release resources */
|
/* release resources */
|
||||||
iounmap(dev->lmmio);
|
iounmap(dev->lmmio);
|
||||||
|
|
|
@ -384,6 +384,7 @@ static int tw68_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
|
||||||
unsigned tot_bufs = q->num_buffers + *num_buffers;
|
unsigned tot_bufs = q->num_buffers + *num_buffers;
|
||||||
|
|
||||||
sizes[0] = (dev->fmt->depth * dev->width * dev->height) >> 3;
|
sizes[0] = (dev->fmt->depth * dev->width * dev->height) >> 3;
|
||||||
|
alloc_ctxs[0] = dev->alloc_ctx;
|
||||||
/*
|
/*
|
||||||
* We allow create_bufs, but only if the sizeimage is the same as the
|
* We allow create_bufs, but only if the sizeimage is the same as the
|
||||||
* current sizeimage. The tw68_buffer_count calculation becomes quite
|
* current sizeimage. The tw68_buffer_count calculation becomes quite
|
||||||
|
|
|
@ -181,6 +181,7 @@ struct tw68_dev {
|
||||||
unsigned field;
|
unsigned field;
|
||||||
struct vb2_queue vidq;
|
struct vb2_queue vidq;
|
||||||
struct list_head active;
|
struct list_head active;
|
||||||
|
void *alloc_ctx;
|
||||||
|
|
||||||
/* various v4l controls */
|
/* various v4l controls */
|
||||||
const struct tw68_tvnorm *tvnorm; /* video */
|
const struct tw68_tvnorm *tvnorm; /* video */
|
||||||
|
|
|
@ -1079,6 +1079,8 @@ static int mcam_vb_queue_setup(struct vb2_queue *vq,
|
||||||
*nbufs = minbufs;
|
*nbufs = minbufs;
|
||||||
if (cam->buffer_mode == B_DMA_contig)
|
if (cam->buffer_mode == B_DMA_contig)
|
||||||
alloc_ctxs[0] = cam->vb_alloc_ctx;
|
alloc_ctxs[0] = cam->vb_alloc_ctx;
|
||||||
|
else if (cam->buffer_mode == B_DMA_sg)
|
||||||
|
alloc_ctxs[0] = cam->vb_alloc_ctx_sg;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1286,10 +1288,12 @@ static int mcam_setup_vb2(struct mcam_camera *cam)
|
||||||
vq->ops = &mcam_vb2_ops;
|
vq->ops = &mcam_vb2_ops;
|
||||||
vq->mem_ops = &vb2_dma_contig_memops;
|
vq->mem_ops = &vb2_dma_contig_memops;
|
||||||
vq->buf_struct_size = sizeof(struct mcam_vb_buffer);
|
vq->buf_struct_size = sizeof(struct mcam_vb_buffer);
|
||||||
cam->vb_alloc_ctx = vb2_dma_contig_init_ctx(cam->dev);
|
|
||||||
vq->io_modes = VB2_MMAP | VB2_USERPTR;
|
vq->io_modes = VB2_MMAP | VB2_USERPTR;
|
||||||
cam->dma_setup = mcam_ctlr_dma_contig;
|
cam->dma_setup = mcam_ctlr_dma_contig;
|
||||||
cam->frame_complete = mcam_dma_contig_done;
|
cam->frame_complete = mcam_dma_contig_done;
|
||||||
|
cam->vb_alloc_ctx = vb2_dma_contig_init_ctx(cam->dev);
|
||||||
|
if (IS_ERR(cam->vb_alloc_ctx))
|
||||||
|
return PTR_ERR(cam->vb_alloc_ctx);
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
case B_DMA_sg:
|
case B_DMA_sg:
|
||||||
|
@ -1300,6 +1304,9 @@ static int mcam_setup_vb2(struct mcam_camera *cam)
|
||||||
vq->io_modes = VB2_MMAP | VB2_USERPTR;
|
vq->io_modes = VB2_MMAP | VB2_USERPTR;
|
||||||
cam->dma_setup = mcam_ctlr_dma_sg;
|
cam->dma_setup = mcam_ctlr_dma_sg;
|
||||||
cam->frame_complete = mcam_dma_sg_done;
|
cam->frame_complete = mcam_dma_sg_done;
|
||||||
|
cam->vb_alloc_ctx_sg = vb2_dma_sg_init_ctx(cam->dev);
|
||||||
|
if (IS_ERR(cam->vb_alloc_ctx_sg))
|
||||||
|
return PTR_ERR(cam->vb_alloc_ctx_sg);
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
case B_vmalloc:
|
case B_vmalloc:
|
||||||
|
@ -1325,6 +1332,10 @@ static void mcam_cleanup_vb2(struct mcam_camera *cam)
|
||||||
if (cam->buffer_mode == B_DMA_contig)
|
if (cam->buffer_mode == B_DMA_contig)
|
||||||
vb2_dma_contig_cleanup_ctx(cam->vb_alloc_ctx);
|
vb2_dma_contig_cleanup_ctx(cam->vb_alloc_ctx);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef MCAM_MODE_DMA_SG
|
||||||
|
if (cam->buffer_mode == B_DMA_sg)
|
||||||
|
vb2_dma_sg_cleanup_ctx(cam->vb_alloc_ctx_sg);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -176,6 +176,7 @@ struct mcam_camera {
|
||||||
/* DMA buffers - DMA modes */
|
/* DMA buffers - DMA modes */
|
||||||
struct mcam_vb_buffer *vb_bufs[MAX_DMA_BUFS];
|
struct mcam_vb_buffer *vb_bufs[MAX_DMA_BUFS];
|
||||||
struct vb2_alloc_ctx *vb_alloc_ctx;
|
struct vb2_alloc_ctx *vb_alloc_ctx;
|
||||||
|
struct vb2_alloc_ctx *vb_alloc_ctx_sg;
|
||||||
|
|
||||||
/* Mode-specific ops, set at open time */
|
/* Mode-specific ops, set at open time */
|
||||||
void (*dma_setup)(struct mcam_camera *cam);
|
void (*dma_setup)(struct mcam_camera *cam);
|
||||||
|
|
|
@ -30,7 +30,12 @@ module_param(debug, int, 0644);
|
||||||
printk(KERN_DEBUG "vb2-dma-sg: " fmt, ## arg); \
|
printk(KERN_DEBUG "vb2-dma-sg: " fmt, ## arg); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
struct vb2_dma_sg_conf {
|
||||||
|
struct device *dev;
|
||||||
|
};
|
||||||
|
|
||||||
struct vb2_dma_sg_buf {
|
struct vb2_dma_sg_buf {
|
||||||
|
struct device *dev;
|
||||||
void *vaddr;
|
void *vaddr;
|
||||||
struct page **pages;
|
struct page **pages;
|
||||||
int offset;
|
int offset;
|
||||||
|
@ -89,10 +94,13 @@ static int vb2_dma_sg_alloc_compacted(struct vb2_dma_sg_buf *buf,
|
||||||
static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size,
|
static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size,
|
||||||
enum dma_data_direction dma_dir, gfp_t gfp_flags)
|
enum dma_data_direction dma_dir, gfp_t gfp_flags)
|
||||||
{
|
{
|
||||||
|
struct vb2_dma_sg_conf *conf = alloc_ctx;
|
||||||
struct vb2_dma_sg_buf *buf;
|
struct vb2_dma_sg_buf *buf;
|
||||||
int ret;
|
int ret;
|
||||||
int num_pages;
|
int num_pages;
|
||||||
|
|
||||||
|
if (WARN_ON(alloc_ctx == NULL))
|
||||||
|
return NULL;
|
||||||
buf = kzalloc(sizeof *buf, GFP_KERNEL);
|
buf = kzalloc(sizeof *buf, GFP_KERNEL);
|
||||||
if (!buf)
|
if (!buf)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -118,6 +126,8 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size,
|
||||||
if (ret)
|
if (ret)
|
||||||
goto fail_table_alloc;
|
goto fail_table_alloc;
|
||||||
|
|
||||||
|
/* Prevent the device from being released while the buffer is used */
|
||||||
|
buf->dev = get_device(conf->dev);
|
||||||
buf->handler.refcount = &buf->refcount;
|
buf->handler.refcount = &buf->refcount;
|
||||||
buf->handler.put = vb2_dma_sg_put;
|
buf->handler.put = vb2_dma_sg_put;
|
||||||
buf->handler.arg = buf;
|
buf->handler.arg = buf;
|
||||||
|
@ -153,6 +163,7 @@ static void vb2_dma_sg_put(void *buf_priv)
|
||||||
while (--i >= 0)
|
while (--i >= 0)
|
||||||
__free_page(buf->pages[i]);
|
__free_page(buf->pages[i]);
|
||||||
kfree(buf->pages);
|
kfree(buf->pages);
|
||||||
|
put_device(buf->dev);
|
||||||
kfree(buf);
|
kfree(buf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -356,6 +367,27 @@ const struct vb2_mem_ops vb2_dma_sg_memops = {
|
||||||
};
|
};
|
||||||
EXPORT_SYMBOL_GPL(vb2_dma_sg_memops);
|
EXPORT_SYMBOL_GPL(vb2_dma_sg_memops);
|
||||||
|
|
||||||
|
void *vb2_dma_sg_init_ctx(struct device *dev)
|
||||||
|
{
|
||||||
|
struct vb2_dma_sg_conf *conf;
|
||||||
|
|
||||||
|
conf = kzalloc(sizeof(*conf), GFP_KERNEL);
|
||||||
|
if (!conf)
|
||||||
|
return ERR_PTR(-ENOMEM);
|
||||||
|
|
||||||
|
conf->dev = dev;
|
||||||
|
|
||||||
|
return conf;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(vb2_dma_sg_init_ctx);
|
||||||
|
|
||||||
|
void vb2_dma_sg_cleanup_ctx(void *alloc_ctx)
|
||||||
|
{
|
||||||
|
if (!IS_ERR_OR_NULL(alloc_ctx))
|
||||||
|
kfree(alloc_ctx);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(vb2_dma_sg_cleanup_ctx);
|
||||||
|
|
||||||
MODULE_DESCRIPTION("dma scatter/gather memory handling routines for videobuf2");
|
MODULE_DESCRIPTION("dma scatter/gather memory handling routines for videobuf2");
|
||||||
MODULE_AUTHOR("Andrzej Pietrasiewicz");
|
MODULE_AUTHOR("Andrzej Pietrasiewicz");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
|
@ -21,6 +21,9 @@ static inline struct sg_table *vb2_dma_sg_plane_desc(
|
||||||
return (struct sg_table *)vb2_plane_cookie(vb, plane_no);
|
return (struct sg_table *)vb2_plane_cookie(vb, plane_no);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void *vb2_dma_sg_init_ctx(struct device *dev);
|
||||||
|
void vb2_dma_sg_cleanup_ctx(void *alloc_ctx);
|
||||||
|
|
||||||
extern const struct vb2_mem_ops vb2_dma_sg_memops;
|
extern const struct vb2_mem_ops vb2_dma_sg_memops;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue