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

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

[media] vb2-dma-sg: move dma_(un)map_sg here 



This moves dma_(un)map_sg to the get_userptr/put_userptr and alloc/put
memops of videobuf2-dma-sg.c and adds dma_sync_sg_for_device/cpu to the
prepare/finish memops.

Now that vb2-dma-sg will sync the buffers for you in the prepare/finish
memops we can drop that from the drivers that use dma-sg.

For the solo6x10 driver that was a bit more involved because it needs to
copy JPEG or MPEG headers to the buffer before returning it to userspace,
and that cannot be done in the old place since the buffer there is still
setup for DMA access, not for CPU access. However, the buf_finish
op is the ideal place to do this. By the time buf_finish is called
the buffer is available for CPU access, so copying to the buffer is fine.

[mchehab@osg.samsung.com: Fix a compilation breakage:
 drivers/media/v4l2-core/videobuf2-dma-sg.c:150:19: error: 'struct vb2_dma_sg_buf' has no member named 'dma_sgt']

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 0c3a14c1

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

+0 −3
Original line number Diff line number Diff line
@@ -1167,11 +1167,8 @@ static void buffer_finish(struct vb2_buffer *vb) 
	struct cx23885_dev *dev = vb->vb2_queue->drv_priv;

	struct cx23885_buffer *buf = container_of(vb,

		struct cx23885_buffer, vb);

	struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);



	cx23885_free_buffer(dev, buf);



	dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);

}



static void buffer_queue(struct vb2_buffer *vb)

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

+0 −5
Original line number Diff line number Diff line
@@ -1453,17 +1453,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);

	int rc;



	dprintk(1, "%s: %p\n", __func__, buf);

	if (vb2_plane_size(&buf->vb, 0) < size)

		return -EINVAL;

	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;



	cx23885_risc_databuffer(dev->pci, &buf->risc,

				sgt->sgl,

				port->ts_packet_size, port->ts_packet_count, 0);

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

+0 −3
Original line number Diff line number Diff line
@@ -123,11 +123,8 @@ static void buffer_finish(struct vb2_buffer *vb) 
	struct cx23885_dev *dev = port->dev;

	struct cx23885_buffer *buf = container_of(vb,

		struct cx23885_buffer, vb);

	struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);



	cx23885_free_buffer(dev, buf);



	dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);

}



static void buffer_queue(struct vb2_buffer *vb)

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

+0 −9
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ static int buffer_prepare(struct vb2_buffer *vb) 
		struct cx23885_buffer, vb);

	struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);

	unsigned lines = VBI_PAL_LINE_COUNT;

	int ret;



	if (dev->tvnorm & V4L2_STD_525_60)

		lines = VBI_NTSC_LINE_COUNT;
@@ -152,10 +151,6 @@ static int buffer_prepare(struct vb2_buffer *vb) 
		return -EINVAL;

	vb2_set_plane_payload(vb, 0, lines * VBI_LINE_LENGTH * 2);



	ret = dma_map_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);

	if (!ret)

		return -EIO;



	cx23885_risc_vbibuffer(dev->pci, &buf->risc,

			 sgt->sgl,

			 0, VBI_LINE_LENGTH * lines,
@@ -166,14 +161,10 @@ static int buffer_prepare(struct vb2_buffer *vb) 


static void buffer_finish(struct vb2_buffer *vb)

{

	struct cx23885_dev *dev = vb->vb2_queue->drv_priv;

	struct cx23885_buffer *buf = container_of(vb,

		struct cx23885_buffer, vb);

	struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);



	cx23885_free_buffer(vb->vb2_queue->drv_priv, buf);



	dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);

}



/*

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

+0 −9
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ static int buffer_prepare(struct vb2_buffer *vb) 
	u32 line0_offset, line1_offset;

	struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);

	int field_tff;

	int ret;



	buf->bpl = (dev->width * dev->fmt->depth) >> 3;
@@ -343,10 +342,6 @@ static int buffer_prepare(struct vb2_buffer *vb) 
		return -EINVAL;

	vb2_set_plane_payload(vb, 0, dev->height * buf->bpl);



	ret = dma_map_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);

	if (!ret)

		return -EIO;



	switch (dev->field) {

	case V4L2_FIELD_TOP:

		cx23885_risc_buffer(dev->pci, &buf->risc,
@@ -414,14 +409,10 @@ static int buffer_prepare(struct vb2_buffer *vb) 


static void buffer_finish(struct vb2_buffer *vb)

{

	struct cx23885_dev *dev = vb->vb2_queue->drv_priv;

	struct cx23885_buffer *buf = container_of(vb,

		struct cx23885_buffer, vb);

	struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);



	cx23885_free_buffer(vb->vb2_queue->drv_priv, buf);



	dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);

}



/*