Commit 0705135e authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7237): Convert videobuf-dma-sg to generic DMA API 



videobuf-dma-sg does not need to depend on PCI. Switch it to using generic
DMA API, convert all affected drivers, relax Kconfig restriction, improve
compile-time type checking, fix some Coding Style violations while at it.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent f13613ac

drivers/media/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ config VIDEOBUF_GEN 
	tristate



config VIDEOBUF_DMA_SG

	depends on PCI || ARCH_PXA

	depends on HAS_DMA

	select VIDEOBUF_GEN

	tristate

drivers/media/common/saa7146_vbi.c

+2 −2
Original line number Diff line number Diff line
@@ -407,8 +407,8 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file) 
	fh->vbi_fmt.start[1] = 312;

	fh->vbi_fmt.count[1] = 16;



	videobuf_queue_pci_init(&fh->vbi_q, &vbi_qops,

			    dev->pci, &dev->slock,

	videobuf_queue_sg_init(&fh->vbi_q, &vbi_qops,

			    &dev->pci->dev, &dev->slock,

			    V4L2_BUF_TYPE_VBI_CAPTURE,

			    V4L2_FIELD_SEQ_TB, // FIXME: does this really work?

			    sizeof(struct saa7146_buf),

drivers/media/common/saa7146_video.c

+2 −2
Original line number Diff line number Diff line
@@ -1410,8 +1410,8 @@ static int video_open(struct saa7146_dev *dev, struct file *file) 
	sfmt = format_by_fourcc(dev,fh->video_fmt.pixelformat);

	fh->video_fmt.sizeimage = (fh->video_fmt.width * fh->video_fmt.height * sfmt->depth)/8;



	videobuf_queue_pci_init(&fh->video_q, &video_qops,

			    dev->pci, &dev->slock,

	videobuf_queue_sg_init(&fh->video_q, &video_qops,

			    &dev->pci->dev, &dev->slock,

			    V4L2_BUF_TYPE_VIDEO_CAPTURE,

			    V4L2_FIELD_INTERLACED,

			    sizeof(struct saa7146_buf),

drivers/media/video/bt8xx/bttv-driver.c

+8 −8
Original line number Diff line number Diff line
@@ -2372,7 +2372,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv, 
	if (check_btres(fh, RESOURCE_OVERLAY)) {

		struct bttv_buffer *new;



		new = videobuf_pci_alloc(sizeof(*new));

		new = videobuf_sg_alloc(sizeof(*new));

		new->crop = btv->crop[!!fh->do_crop].rect;

		bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);

		retval = bttv_switch_overlay(btv,fh,new);
@@ -2760,7 +2760,7 @@ static int bttv_overlay(struct file *file, void *f, unsigned int on) 
	mutex_lock(&fh->cap.vb_lock);

	if (on) {

		fh->ov.tvnorm = btv->tvnorm;

		new = videobuf_pci_alloc(sizeof(*new));

		new = videobuf_sg_alloc(sizeof(*new));

		new->crop = btv->crop[!!fh->do_crop].rect;

		bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);

	} else {
@@ -2834,7 +2834,7 @@ static int bttv_s_fbuf(struct file *file, void *f, 
		if (check_btres(fh, RESOURCE_OVERLAY)) {

			struct bttv_buffer *new;



			new = videobuf_pci_alloc(sizeof(*new));

			new = videobuf_sg_alloc(sizeof(*new));

			new->crop = btv->crop[!!fh->do_crop].rect;

			bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);

			retval = bttv_switch_overlay(btv, fh, new);
@@ -3184,7 +3184,7 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait) 
			/* need to capture a new frame */

			if (locked_btres(fh->btv,RESOURCE_VIDEO_STREAM))

				goto err;

			fh->cap.read_buf = videobuf_pci_alloc(fh->cap.msize);

			fh->cap.read_buf = videobuf_sg_alloc(fh->cap.msize);

			if (NULL == fh->cap.read_buf)

				goto err;

			fh->cap.read_buf->memory = V4L2_MEMORY_USERPTR;
@@ -3251,14 +3251,14 @@ static int bttv_open(struct inode *inode, struct file *file) 
	fh->ov.setup_ok = 0;

	v4l2_prio_open(&btv->prio,&fh->prio);



	videobuf_queue_pci_init(&fh->cap, &bttv_video_qops,

			    btv->c.pci, &btv->s_lock,

	videobuf_queue_sg_init(&fh->cap, &bttv_video_qops,

			    &btv->c.pci->dev, &btv->s_lock,

			    V4L2_BUF_TYPE_VIDEO_CAPTURE,

			    V4L2_FIELD_INTERLACED,

			    sizeof(struct bttv_buffer),

			    fh);

	videobuf_queue_pci_init(&fh->vbi, &bttv_vbi_qops,

			    btv->c.pci, &btv->s_lock,

	videobuf_queue_sg_init(&fh->vbi, &bttv_vbi_qops,

			    &btv->c.pci->dev, &btv->s_lock,

			    V4L2_BUF_TYPE_VBI_CAPTURE,

			    V4L2_FIELD_SEQ_TB,

			    sizeof(struct bttv_buffer),

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

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port) 


	/* dvb stuff */

	printk("%s: cx23885 based dvb card\n", dev->name);

	videobuf_queue_pci_init(&port->dvb.dvbq, &dvb_qops, dev->pci, &port->slock,

	videobuf_queue_sg_init(&port->dvb.dvbq, &dvb_qops, &dev->pci->dev, &port->slock,

			    V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP,

			    sizeof(struct cx23885_buffer), port);

	err = dvb_register(port);