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

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

V4L/DVB: videobuf: add queue argument to videobuf_waiton() 



videobuf_waiton() must unlock and relock ext_lock if it has to wait.
For that to happen it needs the videobuf_queue pointer.

Don't attempt to unlock/relock q->ext_lock unless it was locked in the
first place.

vb->state has to be protected by a spinlock to be safe.

This patch is based on code from Mauro Carvalho Chehab <mchehab@redhat.com>.

[mchehab@redhat.com: add extra argument to a few missing places]
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 08bff03e

drivers/media/common/saa7146_fops.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void saa7146_dma_free(struct saa7146_dev *dev,struct videobuf_queue *q, 


	BUG_ON(in_interrupt());



	videobuf_waiton(&buf->vb,0,0);

	videobuf_waiton(q, &buf->vb, 0, 0);

	videobuf_dma_unmap(q->dev, dma);

	videobuf_dma_free(dma);

	buf->vb.state = VIDEOBUF_NEEDS_INIT;

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

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ bttv_dma_free(struct videobuf_queue *q,struct bttv *btv, struct bttv_buffer *buf 
	struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);



	BUG_ON(in_interrupt());

	videobuf_waiton(&buf->vb,0,0);

	videobuf_waiton(q, &buf->vb, 0, 0);

	videobuf_dma_unmap(q->dev, dma);

	videobuf_dma_free(dma);

	btcx_riscmem_free(btv->c.pci,&buf->bottom);

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

+1 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf) 
	struct videobuf_dmabuf *dma = videobuf_to_dma(&buf->vb);



	BUG_ON(in_interrupt());

	videobuf_waiton(&buf->vb, 0, 0);

	videobuf_waiton(q, &buf->vb, 0, 0);

	videobuf_dma_unmap(q->dev, dma);

	videobuf_dma_free(dma);

	btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);

drivers/media/video/cx88/cx88-core.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf) 
	struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);



	BUG_ON(in_interrupt());

	videobuf_waiton(&buf->vb,0,0);

	videobuf_waiton(q, &buf->vb, 0, 0);

	videobuf_dma_unmap(q->dev, dma);

	videobuf_dma_free(dma);

	btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);

drivers/media/video/fsl-viu.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static void free_buffer(struct videobuf_queue *vq, struct viu_buf *buf) 


	BUG_ON(in_interrupt());



	videobuf_waiton(&buf->vb, 0, 0);

	videobuf_waiton(vq, &buf->vb, 0, 0);



	if (vq->int_ops && vq->int_ops->vaddr)

		vaddr = vq->int_ops->vaddr(vb);