From patchwork Thu Sep 7 18:42:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9942711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 69D14600CB for ; Thu, 7 Sep 2017 18:46:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 670A828800 for ; Thu, 7 Sep 2017 18:46:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65B08287FE; Thu, 7 Sep 2017 18:46:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F739287FE for ; Thu, 7 Sep 2017 18:46:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755926AbdIGSpe (ORCPT ); Thu, 7 Sep 2017 14:45:34 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:35295 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755950AbdIGSnE (ORCPT ); Thu, 7 Sep 2017 14:43:04 -0400 Received: by mail-qt0-f195.google.com with SMTP id p55so328396qtc.2; Thu, 07 Sep 2017 11:43:04 -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=q4/G0j2Yg7mycEuDtJAutlAraMw9KjtI+7bBv96zVLc=; b=qDei/OA+wPVzIo9pso1tGXx2F/DRyXiaUDUSOU7t5DqgH9fDt5/0/4PiQR/SMhwmfI HUgOipL2J14EI5tgbB5bCxrf1JNUUw/mWV/VM0QD6UZYDhJOBwsmmhNTohpJhx1z9EI4 3vIUt54BiDj19wyMxVegWKJCm/M45M5OiXWNo/DcG9/5aH3K0wntAddMdQ3jsE/5u1MQ A+ZCpl837ZMGTaTOdT2ErZyzrxSrKTHRFxhpbmBcFt0LC+YpeTVXAhnH1qFFaig4vyfY SC41VkCIDdUeHnbLKbyiffUT+n97lYF23z5Oq/2Z5zt+BuxnrbZs2HUh4F+XsKRUKCe9 p6ZA== X-Gm-Message-State: AHPjjUh2UuKe5bkL9NvPLcQoXi/fqFne7LqTBESMGToxOf2gxdRTsnM0 XAlpUk+HA0SZ4yIG1kg= X-Google-Smtp-Source: AOwi7QCGo5paOHTEczW5KhjK0XZVtIr7vniaMWJumJLqxHfhoho6DGNbQBZwm7PsUbXWEOJ9DdX7WQ== X-Received: by 10.200.39.24 with SMTP id g24mr465951qtg.230.1504809783507; Thu, 07 Sep 2017 11:43:03 -0700 (PDT) Received: from localhost.localdomain ([187.10.21.246]) by smtp.gmail.com with ESMTPSA id v30sm213216qtg.70.2017.09.07.11.43.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Sep 2017 11:43:03 -0700 (PDT) From: Gustavo Padovan To: linux-media@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Shuah Khan , linux-kernel@vger.kernel.org, Gustavo Padovan Subject: [PATCH v3 09/15] [media] v4l: add support to BUF_QUEUED event Date: Thu, 7 Sep 2017 15:42:20 -0300 Message-Id: <20170907184226.27482-10-gustavo@padovan.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170907184226.27482-1-gustavo@padovan.org> References: <20170907184226.27482-1-gustavo@padovan.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. v3: - Do not call v4l2 event API from vb2 (Mauro) v2: - Use VIDEO_MAX_FRAME to allocate room for events at v4l2_event_subscribe() (Hans) Signed-off-by: Gustavo Padovan --- drivers/media/v4l2-core/v4l2-ctrls.c | 6 +++++- drivers/media/v4l2-core/videobuf2-core.c | 2 ++ drivers/media/v4l2-core/videobuf2-v4l2.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index dd1db678718c..17d4b9e3eec6 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -3438,8 +3438,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, VIDEO_MAX_FRAME, 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 b19c1bc4b083..bbbae0eed567 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -1231,6 +1231,8 @@ static void __enqueue_in_driver(struct vb2_buffer *vb) trace_vb2_buf_queue(q, vb); call_void_vb_qop(vb, buf_queue, vb); + + call_void_bufop(q, buffer_queued, vb); } static int __buf_prepare(struct vb2_buffer *vb, const void *pb) diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c index 8c322cd1b346..bbfcd054e6f6 100644 --- a/drivers/media/v4l2-core/videobuf2-v4l2.c +++ b/drivers/media/v4l2-core/videobuf2-v4l2.c @@ -138,6 +138,19 @@ static void __copy_timestamp(struct vb2_buffer *vb, const void *pb) } }; +static void __buffer_queued(struct vb2_buffer *vb) +{ + struct video_device *vdev = to_video_device(vb->vb2_queue->dev); + struct v4l2_fh *fh = vdev->queue->owner; + 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_fh(fh, &event); +} + static void vb2_warn_zero_bytesused(struct vb2_buffer *vb) { static bool check_once; @@ -455,6 +468,7 @@ static const struct vb2_buf_ops v4l2_buf_ops = { .fill_user_buffer = __fill_v4l2_buffer, .fill_vb2_buffer = __fill_vb2_buffer, .copy_timestamp = __copy_timestamp, + .buffer_queued = __buffer_queued, }; /**