Commit d61233bf authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[media] media: blackfin: bfin_capture: use vb2_ioctl_* helpers 



this patch adds support to vb2_ioctl_* helpers.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Tested-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent f0e91c65

drivers/media/platform/blackfin/bfin_capture.c

+18 −85
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count) 
	struct ppi_if *ppi = bcap_dev->ppi;

	struct bcap_buffer *buf, *tmp;

	struct ppi_params params;

	dma_addr_t addr;

	int ret;



	/* enable streamon on the sub device */
@@ -335,6 +336,17 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count) 
	reinit_completion(&bcap_dev->comp);

	bcap_dev->stop = false;



	/* get the next frame from the dma queue */

	bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next,

					struct bcap_buffer, list);

	/* remove buffer from the dma queue */

	list_del_init(&bcap_dev->cur_frm->list);

	addr = vb2_dma_contig_plane_dma_addr(&bcap_dev->cur_frm->vb, 0);

	/* update DMA address */

	ppi->ops->update_addr(ppi, (unsigned long)addr);

	/* enable ppi */

	ppi->ops->start(ppi);



	return 0;



err:
@@ -381,40 +393,6 @@ static struct vb2_ops bcap_video_qops = { 
	.stop_streaming         = bcap_stop_streaming,

};



static int bcap_reqbufs(struct file *file, void *priv,

			struct v4l2_requestbuffers *req_buf)

{

	struct bcap_device *bcap_dev = video_drvdata(file);

	struct vb2_queue *vq = &bcap_dev->buffer_queue;



	return vb2_reqbufs(vq, req_buf);

}



static int bcap_querybuf(struct file *file, void *priv,

				struct v4l2_buffer *buf)

{

	struct bcap_device *bcap_dev = video_drvdata(file);



	return vb2_querybuf(&bcap_dev->buffer_queue, buf);

}



static int bcap_qbuf(struct file *file, void *priv,

			struct v4l2_buffer *buf)

{

	struct bcap_device *bcap_dev = video_drvdata(file);



	return vb2_qbuf(&bcap_dev->buffer_queue, buf);

}



static int bcap_dqbuf(struct file *file, void *priv,

			struct v4l2_buffer *buf)

{

	struct bcap_device *bcap_dev = video_drvdata(file);



	return vb2_dqbuf(&bcap_dev->buffer_queue,

				buf, file->f_flags & O_NONBLOCK);

}



static irqreturn_t bcap_isr(int irq, void *dev_id)

{

	struct ppi_if *ppi = dev_id;
@@ -456,51 +434,6 @@ static irqreturn_t bcap_isr(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static int bcap_streamon(struct file *file, void *priv,

				enum v4l2_buf_type buf_type)

{

	struct bcap_device *bcap_dev = video_drvdata(file);

	struct ppi_if *ppi = bcap_dev->ppi;

	dma_addr_t addr;

	int ret;



	/* call streamon to start streaming in videobuf */

	ret = vb2_streamon(&bcap_dev->buffer_queue, buf_type);

	if (ret)

		return ret;



	/* if dma queue is empty, return error */

	if (list_empty(&bcap_dev->dma_queue)) {

		v4l2_err(&bcap_dev->v4l2_dev, "dma queue is empty\n");

		ret = -EINVAL;

		goto err;

	}



	/* get the next frame from the dma queue */

	bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next,

					struct bcap_buffer, list);

	/* remove buffer from the dma queue */

	list_del_init(&bcap_dev->cur_frm->list);

	addr = vb2_dma_contig_plane_dma_addr(&bcap_dev->cur_frm->vb, 0);

	/* update DMA address */

	ppi->ops->update_addr(ppi, (unsigned long)addr);

	/* enable ppi */

	ppi->ops->start(ppi);



	return 0;

err:

	vb2_streamoff(&bcap_dev->buffer_queue, buf_type);

	return ret;

}



static int bcap_streamoff(struct file *file, void *priv,

				enum v4l2_buf_type buf_type)

{

	struct bcap_device *bcap_dev = video_drvdata(file);



	return vb2_streamoff(&bcap_dev->buffer_queue, buf_type);

}



static int bcap_querystd(struct file *file, void *priv, v4l2_std_id *std)

{

	struct bcap_device *bcap_dev = video_drvdata(file);
@@ -786,12 +719,12 @@ static const struct v4l2_ioctl_ops bcap_ioctl_ops = { 
	.vidioc_g_dv_timings     = bcap_g_dv_timings,

	.vidioc_query_dv_timings = bcap_query_dv_timings,

	.vidioc_enum_dv_timings  = bcap_enum_dv_timings,

	.vidioc_reqbufs          = bcap_reqbufs,

	.vidioc_querybuf         = bcap_querybuf,

	.vidioc_qbuf             = bcap_qbuf,

	.vidioc_dqbuf            = bcap_dqbuf,

	.vidioc_streamon         = bcap_streamon,

	.vidioc_streamoff        = bcap_streamoff,

	.vidioc_reqbufs          = vb2_ioctl_reqbufs,

	.vidioc_querybuf         = vb2_ioctl_querybuf,

	.vidioc_qbuf             = vb2_ioctl_qbuf,

	.vidioc_dqbuf            = vb2_ioctl_dqbuf,

	.vidioc_streamon         = vb2_ioctl_streamon,

	.vidioc_streamoff        = vb2_ioctl_streamoff,

	.vidioc_g_parm           = bcap_g_parm,

	.vidioc_s_parm           = bcap_s_parm,

	.vidioc_log_status       = bcap_log_status,

CRA Git | Maintained and supported by SUSTech CRA and CCSE