[RFC 07/10] [media] v4l: add support to BUF_QUEUED event

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Gustavo Padovan <gustavo@padovan.org>
Newsgroups	linux.kernel
Subject	[RFC 07/10] [media] v4l: add support to BUF_QUEUED event
Date	Mon, 13 Mar 2017 20:30:01 +0100
Message-ID	<tkDPj-58M-5@gated-at.bofh.it> (permalink)
References	<tkDPj-58M-7@gated-at.bofh.it>
X-Original-To	linux-media@vger.kernel.org
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XJUkOZELPdGOmTvO8JhKWx2dabtFw7Qg2bqlb6P5A1U=; b=b0hf2ToSQ6cY5HzryJj91h3xW5LfIXb+Jyhn/qChMaYXQe1fRzghTAJHTLdr7tQDgQ MpPyfxOGRjBB+iwSLNJwRiDjRnt2N/waz8p7c+eMeqtwvkzcPaRN5KDJbIt/hxkQ7HJv kI+xHrUOKt4Rng4SEacS6/SB/mwt1iFPvPukSmk8scHTmy+9jU6pabgSlRAfJ7ubsnSW gJY3fss88pxhQ1wZHxeGz9iFRAzEHsw78rrcrZ+eT1z6TexhZ+WKAjcq2qbyqo/1s2J3 owQQ3JK0Ev/iElYmwPw8/l9kboMgymA/ebhyeRHp68JnBhg2INZh7w15BpgzO7QpBcT7 y8aQ==
X-Gm-Message-State	AMke39ldLqWhPep1HDn0CUiWWplzhwzyRch7IkHhqHEYPBPBqfp1qLEqSxGnbqFszccEEQ==
X-Received	by 10.200.1.206 with SMTP id b14mr33809409qtg.285.1489432861765; Mon, 13 Mar 2017 12:21:01 -0700 (PDT)
X-Mailer	git-send-email 2.9.3
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	72
Organization	linux.* mail to news gateway
X-Original-Cc	Hans Verkuil <hverkuil@xs4all.nl>, Mauro Carvalho Chehab <mchehab@osg.samsung.com>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Javier Martinez Canillas <javier@osg.samsung.com>, linux-kernel@vger.kernel.org, Gustavo Padovan <gustavo.padovan@collabora.com>
X-Original-Date	Mon, 13 Mar 2017 16:20:32 -0300
X-Original-Message-ID	<20170313192035.29859-8-gustavo@padovan.org>
X-Original-References	<20170313192035.29859-1-gustavo@padovan.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1599711

Show key headers only | View raw

From: Gustavo Padovan <gustavo.padovan@collabora.com>

Implement the needed pieces to let userspace subscribe for
V4L2_EVENT_BUF_QUEUED events. Videobuf2 will queue the event for the
DQEVENT ioctl.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
---
 drivers/media/v4l2-core/v4l2-ctrls.c     |  6 +++++-
 drivers/media/v4l2-core/videobuf2-core.c | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index b9e08e3..1be554b 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -3413,8 +3413,12 @@ EXPORT_SYMBOL(v4l2_ctrl_log_status);
 int v4l2_ctrl_subscribe_event(struct v4l2_fh *fh,
 				const struct v4l2_event_subscription *sub)
 {
-	if (sub->type == V4L2_EVENT_CTRL)
+	switch (sub->type) {
+	case V4L2_EVENT_CTRL:
 		return v4l2_event_subscribe(fh, sub, 0, &v4l2_ctrl_sub_ev_ops);
+	case V4L2_EVENT_BUF_QUEUED:
+		return v4l2_event_subscribe(fh, sub, 0, NULL);
+	}
 	return -EINVAL;
 }
 EXPORT_SYMBOL(v4l2_ctrl_subscribe_event);
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index e0e7109..d9cb777 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -25,6 +25,7 @@
 #include <linux/kthread.h>
 
 #include <media/videobuf2-core.h>
+#include <media/v4l2-event.h>
 #include <media/v4l2-mc.h>
 
 #include <trace/events/vb2.h>
@@ -1221,6 +1222,18 @@ static int __qbuf_dmabuf(struct vb2_buffer *vb, const void *pb)
 	return ret;
 }
 
+static void vb2_buffer_queued_event(struct vb2_buffer *vb)
+{
+	struct video_device *vdev = to_video_device(vb->vb2_queue->dev);
+	struct v4l2_event event;
+
+	memset(&event, 0, sizeof(event));
+	event.type = V4L2_EVENT_BUF_QUEUED;
+	event.u.buf_queued.index = vb->index;
+
+	v4l2_event_queue(vdev, &event);
+}
+
 /**
  * __enqueue_in_driver() - enqueue a vb2_buffer in driver for processing
  */
@@ -1239,6 +1252,8 @@ static void __enqueue_in_driver(struct vb2_buffer *vb)
 		call_void_memop(vb, prepare, vb->planes[plane].mem_priv);
 
 	call_void_vb_qop(vb, buf_queue, vb);
+
+	vb2_buffer_queued_event(vb);
 }
 
 static int __buf_prepare(struct vb2_buffer *vb, const void *pb)
-- 
2.9.3

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[RFC 07/10] [media] v4l: add support to BUF_QUEUED event Gustavo Padovan <gustavo@padovan.org> - 2017-03-13 20:30 +0100

csiph-web