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

media: m2m-deinterlace: use struct v4l2_fh 



Convert this driver to use struct v4l2_fh and as a result switch to
using vb2/v4l2_mem2mem helper functions as well.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 2dbcb6fb

drivers/media/platform/m2m-deinterlace.c

+36 −88
Original line number Diff line number Diff line
@@ -132,13 +132,13 @@ struct deinterlace_dev { 
};



struct deinterlace_ctx {

	struct v4l2_fh		fh;

	struct deinterlace_dev	*dev;



	/* Abort requested by m2m */

	int			aborting;

	enum v4l2_colorspace	colorspace;

	dma_cookie_t		cookie;

	struct v4l2_m2m_ctx	*m2m_ctx;

	struct dma_interleaved_template *xt;

};
@@ -150,9 +150,9 @@ static int deinterlace_job_ready(void *priv) 
	struct deinterlace_ctx *ctx = priv;

	struct deinterlace_dev *pcdev = ctx->dev;



	if ((v4l2_m2m_num_src_bufs_ready(ctx->m2m_ctx) > 0)

	    && (v4l2_m2m_num_dst_bufs_ready(ctx->m2m_ctx) > 0)

	    && (atomic_read(&ctx->dev->busy) == 0)) {

	if (v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx) > 0 &&

	    v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx) > 0 &&

	    !atomic_read(&ctx->dev->busy)) {

		dprintk(pcdev, "Task ready\n");

		return 1;

	}
@@ -171,7 +171,7 @@ static void deinterlace_job_abort(void *priv) 


	dprintk(pcdev, "Aborting task\n");



	v4l2_m2m_job_finish(pcdev->m2m_dev, ctx->m2m_ctx);

	v4l2_m2m_job_finish(pcdev->m2m_dev, ctx->fh.m2m_ctx);

}



static void dma_callback(void *data)
@@ -182,8 +182,8 @@ static void dma_callback(void *data) 


	atomic_set(&pcdev->busy, 0);



	src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx);

	dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx);

	src_vb = v4l2_m2m_src_buf_remove(curr_ctx->fh.m2m_ctx);

	dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->fh.m2m_ctx);



	dst_vb->vb2_buf.timestamp = src_vb->vb2_buf.timestamp;

	dst_vb->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
@@ -194,7 +194,7 @@ static void dma_callback(void *data) 
	v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);

	v4l2_m2m_buf_done(dst_vb, VB2_BUF_STATE_DONE);



	v4l2_m2m_job_finish(pcdev->m2m_dev, curr_ctx->m2m_ctx);

	v4l2_m2m_job_finish(pcdev->m2m_dev, curr_ctx->fh.m2m_ctx);



	dprintk(pcdev, "dma transfers completed.\n");

}
@@ -213,8 +213,8 @@ static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op, 
	dma_addr_t p_in, p_out;

	enum dma_ctrl_flags flags;



	src_buf = v4l2_m2m_next_src_buf(ctx->m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);

	src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);



	s_q_data = get_q_data(V4L2_BUF_TYPE_VIDEO_OUTPUT);

	s_width	= s_q_data->width;
@@ -483,7 +483,7 @@ static int vidioc_g_fmt(struct deinterlace_ctx *ctx, struct v4l2_format *f) 
	struct vb2_queue *vq;

	struct deinterlace_q_data *q_data;



	vq = v4l2_m2m_get_vq(ctx->m2m_ctx, f->type);

	vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);

	if (!vq)

		return -EINVAL;
@@ -580,7 +580,7 @@ static int vidioc_s_fmt(struct deinterlace_ctx *ctx, struct v4l2_format *f) 
	struct deinterlace_q_data *q_data;

	struct vb2_queue *vq;



	vq = v4l2_m2m_get_vq(ctx->m2m_ctx, f->type);

	vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);

	if (!vq)

		return -EINVAL;
@@ -653,36 +653,6 @@ static int vidioc_s_fmt_vid_out(struct file *file, void *priv, 
	return ret;

}



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

			  struct v4l2_requestbuffers *reqbufs)

{

	struct deinterlace_ctx *ctx = priv;



	return v4l2_m2m_reqbufs(file, ctx->m2m_ctx, reqbufs);

}



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

			   struct v4l2_buffer *buf)

{

	struct deinterlace_ctx *ctx = priv;



	return v4l2_m2m_querybuf(file, ctx->m2m_ctx, buf);

}



static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)

{

	struct deinterlace_ctx *ctx = priv;



	return v4l2_m2m_qbuf(file, ctx->m2m_ctx, buf);

}



static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)

{

	struct deinterlace_ctx *ctx = priv;



	return v4l2_m2m_dqbuf(file, ctx->m2m_ctx, buf);

}



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

			   enum v4l2_buf_type type)

{
@@ -723,15 +693,7 @@ static int vidioc_streamon(struct file *file, void *priv, 
		return -EINVAL;

	}



	return v4l2_m2m_streamon(file, ctx->m2m_ctx, type);

}



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

			    enum v4l2_buf_type type)

{

	struct deinterlace_ctx *ctx = priv;



	return v4l2_m2m_streamoff(file, ctx->m2m_ctx, type);

	return v4l2_m2m_streamon(file, ctx->fh.m2m_ctx, type);

}



static const struct v4l2_ioctl_ops deinterlace_ioctl_ops = {
@@ -747,14 +709,15 @@ static const struct v4l2_ioctl_ops deinterlace_ioctl_ops = { 
	.vidioc_try_fmt_vid_out	= vidioc_try_fmt_vid_out,

	.vidioc_s_fmt_vid_out	= vidioc_s_fmt_vid_out,



	.vidioc_reqbufs		= vidioc_reqbufs,

	.vidioc_querybuf	= vidioc_querybuf,



	.vidioc_qbuf		= vidioc_qbuf,

	.vidioc_dqbuf		= vidioc_dqbuf,

	.vidioc_reqbufs		= v4l2_m2m_ioctl_reqbufs,

	.vidioc_querybuf	= v4l2_m2m_ioctl_querybuf,

	.vidioc_qbuf		= v4l2_m2m_ioctl_qbuf,

	.vidioc_dqbuf		= v4l2_m2m_ioctl_dqbuf,

	.vidioc_prepare_buf	= v4l2_m2m_ioctl_prepare_buf,

	.vidioc_expbuf		= v4l2_m2m_ioctl_expbuf,



	.vidioc_streamon	= vidioc_streamon,

	.vidioc_streamoff	= vidioc_streamoff,

	.vidioc_streamoff	= v4l2_m2m_ioctl_streamoff,

};
@@ -818,7 +781,7 @@ static void deinterlace_buf_queue(struct vb2_buffer *vb) 
	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);

	struct deinterlace_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);



	v4l2_m2m_buf_queue(ctx->m2m_ctx, vbuf);

	v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);

}



static const struct vb2_ops deinterlace_qops = {
@@ -836,7 +799,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, 
	int ret;



	src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;

	src_vq->io_modes = VB2_MMAP | VB2_USERPTR;

	src_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;

	src_vq->drv_priv = ctx;

	src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);

	src_vq->ops = &deinterlace_qops;
@@ -855,7 +818,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, 
		return ret;



	dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

	dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;

	dst_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;

	dst_vq->drv_priv = ctx;

	dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);

	dst_vq->ops = &deinterlace_qops;
@@ -884,12 +847,13 @@ static int deinterlace_open(struct file *file) 
	if (!ctx)

		return -ENOMEM;



	file->private_data = ctx;

	v4l2_fh_init(&ctx->fh, video_devdata(file));

	file->private_data = &ctx->fh;

	ctx->dev = pcdev;



	ctx->m2m_ctx = v4l2_m2m_ctx_init(pcdev->m2m_dev, ctx, &queue_init);

	if (IS_ERR(ctx->m2m_ctx)) {

		int ret = PTR_ERR(ctx->m2m_ctx);

	ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(pcdev->m2m_dev, ctx, &queue_init);

	if (IS_ERR(ctx->fh.m2m_ctx)) {

		int ret = PTR_ERR(ctx->fh.m2m_ctx);



		kfree(ctx);

		return ret;
@@ -903,8 +867,10 @@ static int deinterlace_open(struct file *file) 
	}



	ctx->colorspace = V4L2_COLORSPACE_REC709;

	v4l2_fh_add(&ctx->fh);



	dprintk(pcdev, "Created instance %p, m2m_ctx: %p\n", ctx, ctx->m2m_ctx);

	dprintk(pcdev, "Created instance %p, m2m_ctx: %p\n",

		ctx, ctx->fh.m2m_ctx);



	return 0;

}
@@ -916,40 +882,22 @@ static int deinterlace_release(struct file *file) 


	dprintk(pcdev, "Releasing instance %p\n", ctx);



	v4l2_m2m_ctx_release(ctx->m2m_ctx);

	v4l2_fh_del(&ctx->fh);

	v4l2_fh_exit(&ctx->fh);

	v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);

	kfree(ctx->xt);

	kfree(ctx);



	return 0;

}



static __poll_t deinterlace_poll(struct file *file,

				 struct poll_table_struct *wait)

{

	struct deinterlace_ctx *ctx = file->private_data;

	__poll_t ret;



	mutex_lock(&ctx->dev->dev_mutex);

	ret = v4l2_m2m_poll(file, ctx->m2m_ctx, wait);

	mutex_unlock(&ctx->dev->dev_mutex);



	return ret;

}



static int deinterlace_mmap(struct file *file, struct vm_area_struct *vma)

{

	struct deinterlace_ctx *ctx = file->private_data;



	return v4l2_m2m_mmap(file, ctx->m2m_ctx, vma);

}



static const struct v4l2_file_operations deinterlace_fops = {

	.owner		= THIS_MODULE,

	.open		= deinterlace_open,

	.release	= deinterlace_release,

	.poll		= deinterlace_poll,

	.poll		= v4l2_m2m_fop_poll,

	.unlocked_ioctl	= video_ioctl2,

	.mmap		= deinterlace_mmap,

	.mmap		= v4l2_m2m_fop_mmap,

};



static const struct video_device deinterlace_videodev = {