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

Commit 1d120649 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: m2m-deinterlace: Implement wait_prepare and wait_finish 



This driver is currently specifying a video_device lock,
which means it is protecting all the ioctls (including
queue ioctls) with a single mutex.

It's therefore straightforward to implement wait_prepare
and wait_finish, by explicitly setting the vb2_queue lock.

Having these callbacks releases the queue lock while blocking,
which improves latency by allowing for example streamoff
or qbuf operations while waiting in dqbuf.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent a4273abc

drivers/media/platform/m2m-deinterlace.c

+4 −0
Original line number Diff line number Diff line
@@ -842,6 +842,8 @@ static const struct vb2_ops deinterlace_qops = { 
	.queue_setup	 = deinterlace_queue_setup,

	.buf_prepare	 = deinterlace_buf_prepare,

	.buf_queue	 = deinterlace_buf_queue,

	.wait_prepare	 = vb2_ops_wait_prepare,

	.wait_finish	 = vb2_ops_wait_finish,

};



static int queue_init(void *priv, struct vb2_queue *src_vq,
@@ -858,6 +860,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, 
	src_vq->mem_ops = &vb2_dma_contig_memops;

	src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;

	src_vq->dev = ctx->dev->v4l2_dev.dev;

	src_vq->lock = &ctx->dev->dev_mutex;

	q_data[V4L2_M2M_SRC].fmt = &formats[0];

	q_data[V4L2_M2M_SRC].width = 640;

	q_data[V4L2_M2M_SRC].height = 480;
@@ -876,6 +879,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, 
	dst_vq->mem_ops = &vb2_dma_contig_memops;

	dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;

	dst_vq->dev = ctx->dev->v4l2_dev.dev;

	dst_vq->lock = &ctx->dev->dev_mutex;

	q_data[V4L2_M2M_DST].fmt = &formats[0];

	q_data[V4L2_M2M_DST].width = 640;

	q_data[V4L2_M2M_DST].height = 480;