From patchwork Mon Mar 13 19:20:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo F. Padovan" X-Patchwork-Id: 40016 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnVY2-0004MY-7P; Mon, 13 Mar 2017 19:22:26 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-8) with esmtp id 1cnVXz-0002dB-kY; Mon, 13 Mar 2017 20:22:25 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753587AbdCMTVJ (ORCPT + 1 other); Mon, 13 Mar 2017 15:21:09 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:34855 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753284AbdCMTVD (ORCPT ); Mon, 13 Mar 2017 15:21:03 -0400 Received: by mail-qt0-f194.google.com with SMTP id r5so7501646qtb.2; Mon, 13 Mar 2017 12:21:02 -0700 (PDT) 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) Received: from localhost.localdomain ([179.159.9.225]) by smtp.gmail.com with ESMTPSA id a19sm12821047qta.48.2017.03.13.12.20.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Mar 2017 12:21:01 -0700 (PDT) From: Gustavo Padovan To: linux-media@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Laurent Pinchart , Javier Martinez Canillas , linux-kernel@vger.kernel.org, Gustavo Padovan Subject: [RFC 07/10] [media] v4l: add support to BUF_QUEUED event Date: Mon, 13 Mar 2017 16:20:32 -0300 Message-Id: <20170313192035.29859-8-gustavo@padovan.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170313192035.29859-1-gustavo@padovan.org> References: <20170313192035.29859-1-gustavo@padovan.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.3.13.191217 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_RCPTS_CC_X2 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Gustavo Padovan 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 --- 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 #include +#include #include #include @@ -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)