Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c3a14c1 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarPawel Osciak <pawel@osciak.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent e5ae8fa7

drivers/media/pci/cx23885/cx23885-417.c

+1 −0
Original line number Diff line number Diff line
@@ -1148,6 +1148,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt, 
	dev->ts1.ts_packet_count = mpeglines;

	*num_planes = 1;

	sizes[0] = mpeglinesize * mpeglines;

	alloc_ctxs[0] = dev->alloc_ctx;

	*num_buffers = mpegbufs;

	return 0;

}

drivers/media/pci/cx23885/cx23885-core.c

+9 −1
Original line number Diff line number Diff line
@@ -1997,9 +1997,14 @@ static int cx23885_initdev(struct pci_dev *pci_dev, 
	if (!pci_dma_supported(pci_dev, 0xffffffff)) {

		printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);

		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,

			  IRQF_SHARED, dev->name, dev);

	if (err < 0) {
@@ -2028,6 +2033,8 @@ static int cx23885_initdev(struct pci_dev *pci_dev, 
	return 0;



fail_irq:

	vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);

fail_context:

	cx23885_dev_unregister(dev);

fail_ctrl:

	v4l2_ctrl_handler_free(hdl);
@@ -2053,6 +2060,7 @@ static void cx23885_finidev(struct pci_dev *pci_dev) 
	free_irq(pci_dev->irq, dev);



	cx23885_dev_unregister(dev);

	vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);

	v4l2_ctrl_handler_free(&dev->ctrl_handler);

	v4l2_device_unregister(v4l2_dev);

	kfree(dev);

drivers/media/pci/cx23885/cx23885-dvb.c

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt, 
	port->ts_packet_count = 32;

	*num_planes = 1;

	sizes[0] = port->ts_packet_size * port->ts_packet_count;

	alloc_ctxs[0] = port->dev->alloc_ctx;

	*num_buffers = 32;

	return 0;

}

drivers/media/pci/cx23885/cx23885-vbi.c

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt, 
		lines = VBI_NTSC_LINE_COUNT;

	*num_planes = 1;

	sizes[0] = lines * VBI_LINE_LENGTH * 2;

	alloc_ctxs[0] = dev->alloc_ctx;

	return 0;

}

drivers/media/pci/cx23885/cx23885-video.c

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt, 


	*num_planes = 1;

	sizes[0] = (dev->fmt->depth * dev->width * dev->height) >> 3;

	alloc_ctxs[0] = dev->alloc_ctx;

	return 0;

}