From patchwork Thu Sep 28 09:50:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Courbot X-Patchwork-Id: 9975633 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 DB17F6034B for ; Thu, 28 Sep 2017 09:51:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCA6C29544 for ; Thu, 28 Sep 2017 09:51:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C183729547; Thu, 28 Sep 2017 09:51:31 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham 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 2CB4329544 for ; Thu, 28 Sep 2017 09:51:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752778AbdI1Jv3 (ORCPT ); Thu, 28 Sep 2017 05:51:29 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:49935 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752743AbdI1JvZ (ORCPT ); Thu, 28 Sep 2017 05:51:25 -0400 Received: by mail-pg0-f51.google.com with SMTP id v13so94023pgq.6 for ; Thu, 28 Sep 2017 02:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DlISjhYPKozYDaL78rTjaTfOo3bjm+0bkC3DgNV0uH8=; b=IH+Oae8ZsvisQZvZorrATw/Pq8sOrzbQLiIrp3YIuX6ftBrUCLLQHh+CMRGsd/HzeX aQEm/FspY1ptGWLwkFUmu9TMQ7MpsMcjxg6Iyq8moWK6P21mmnBNFLJyquL1fBD6uZso H9UG4/Vyok6BbGn1RDirbZoHExHM7mGLTGEzE= 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=DlISjhYPKozYDaL78rTjaTfOo3bjm+0bkC3DgNV0uH8=; b=qUgnxqgySoOeHuEVOXVU+PkkMEL6bRFVmCRO4vFj8VgUnuXPOADWGyCamjiR85mXFg FCv9UwPLOaTfir4h6uzCO6Uorkt+qTKm/r8NcpB7gnBtzG0eTdYQt0fIRPgDEuZHXRrQ RIJmg/mFyPRVzlyf/KMyKhTY640D4XBj43IxRJOjp06XtuSjM1AOg4hpUY+0fmI0Yigl 8dLd/bHoepumTEj8y3MVOr/p0UcKtBIMj4Xr0T6G1g7iNrsdEDW1P2HYoj7RpPHv/avK SSf/epXeKuBDlBfMoOUbZMS8uCbLeWBewNwhVUTOOleLnk4BkSh/966RnApF/+KOjzL6 7bxQ== X-Gm-Message-State: AHPjjUhyhS7Ur5iy7lVIBxFCDwPOMVXbts8CDYm8aEbtDNZb6ibprovt Nz7inR+5wNu8SbvRa8mYwes53w== X-Google-Smtp-Source: AOwi7QCGhtNWIMgwuodfzlRFiWMHYhcfND1bGreZQ1ePg4fkpZA+elyqDTWCXyFpboH1BBxH94Kf5w== X-Received: by 10.84.245.149 with SMTP id j21mr3651630pll.105.1506592284760; Thu, 28 Sep 2017 02:51:24 -0700 (PDT) Received: from acourbot.tok.corp.google.com ([100.103.2.117]) by smtp.gmail.com with ESMTPSA id p88sm2319469pfi.174.2017.09.28.02.51.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Sep 2017 02:51:24 -0700 (PDT) From: Alexandre Courbot To: Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Pawel Osciak , Marek Szyprowski , Tomasz Figa , Sakari Ailus , Gustavo Padovan Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Alexandre Courbot Subject: [RFC PATCH 8/9] [media] vivid: add jobs API support for capture device Date: Thu, 28 Sep 2017 18:50:26 +0900 Message-Id: <20170928095027.127173-9-acourbot@chromium.org> X-Mailer: git-send-email 2.14.2.822.g60be5d43e6-goog In-Reply-To: <20170928095027.127173-1-acourbot@chromium.org> References: <20170928095027.127173-1-acourbot@chromium.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 Add support for jobs in the vivid capture device, using the generic state handler. Signed-off-by: Alexandre Courbot --- drivers/media/platform/vivid/vivid-core.c | 16 ++++++++++++++++ drivers/media/platform/vivid/vivid-core.h | 2 ++ drivers/media/platform/vivid/vivid-kthread-cap.c | 5 +++++ 3 files changed, 23 insertions(+) diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c index ef344b9a48af..161c2199d2aa 100644 --- a/drivers/media/platform/vivid/vivid-core.c +++ b/drivers/media/platform/vivid/vivid-core.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "vivid-core.h" #include "vivid-vid-common.h" @@ -639,6 +640,14 @@ static void vivid_dev_release(struct v4l2_device *v4l2_dev) kfree(dev); } +void vivid_process_active_job(struct v4l2_job_state_handler *hdl) +{ + struct vivid_dev *dev = container_of(hdl, struct vivid_dev, + state_hdl_vid_cap.base); + + vb2_queue_active_job_buffers(&dev->vb_vid_cap_q); +} + static int vivid_create_instance(struct platform_device *pdev, int inst) { static const struct v4l2_dv_timings def_dv_timings = @@ -1071,6 +1080,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) q->min_buffers_needed = 2; q->lock = &dev->mutex; q->dev = dev->v4l2_dev.dev; + q->state_handler = &dev->state_hdl_vid_cap.base; ret = vb2_queue_init(q); if (ret) @@ -1185,6 +1195,12 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) vfd->lock = &dev->mutex; video_set_drvdata(vfd, dev); + ret = v4l2_job_generic_init(&dev->state_hdl_vid_cap, + vivid_process_active_job, NULL, vfd); + if (ret) + return ret; + + #ifdef CONFIG_VIDEO_VIVID_CEC if (in_type_counter[HDMI]) { struct cec_adapter *adap; diff --git a/drivers/media/platform/vivid/vivid-core.h b/drivers/media/platform/vivid/vivid-core.h index 5cdf95bdc4d1..c4014816beb7 100644 --- a/drivers/media/platform/vivid/vivid-core.h +++ b/drivers/media/platform/vivid/vivid-core.h @@ -28,6 +28,7 @@ #include #include #include +#include #include "vivid-rds-gen.h" #include "vivid-vbi-gen.h" @@ -156,6 +157,7 @@ struct vivid_dev { struct v4l2_ctrl_handler ctrl_hdl_loop_cap; struct video_device vid_cap_dev; struct v4l2_ctrl_handler ctrl_hdl_vid_cap; + struct v4l2_generic_state_handler state_hdl_vid_cap; struct video_device vid_out_dev; struct v4l2_ctrl_handler ctrl_hdl_vid_out; struct video_device vbi_cap_dev; diff --git a/drivers/media/platform/vivid/vivid-kthread-cap.c b/drivers/media/platform/vivid/vivid-kthread-cap.c index 6ca71aabb576..b31ebfa55eca 100644 --- a/drivers/media/platform/vivid/vivid-kthread-cap.c +++ b/drivers/media/platform/vivid/vivid-kthread-cap.c @@ -683,6 +683,7 @@ static void vivid_thread_vid_cap_tick(struct vivid_dev *dev, int dropped_bufs) { struct vivid_buffer *vid_cap_buf = NULL; struct vivid_buffer *vbi_cap_buf = NULL; + bool vid_job_complete; dprintk(dev, 1, "Video Capture Thread Tick\n"); @@ -700,6 +701,7 @@ static void vivid_thread_vid_cap_tick(struct vivid_dev *dev, int dropped_bufs) if (!list_empty(&dev->vid_cap_active)) { vid_cap_buf = list_entry(dev->vid_cap_active.next, struct vivid_buffer, list); list_del(&vid_cap_buf->list); + vid_job_complete = list_empty(&dev->vid_cap_active); } if (!list_empty(&dev->vbi_cap_active)) { if (dev->field_cap != V4L2_FIELD_ALTERNATE || @@ -729,6 +731,9 @@ static void vivid_thread_vid_cap_tick(struct vivid_dev *dev, int dropped_bufs) VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); dprintk(dev, 2, "vid_cap buffer %d done\n", vid_cap_buf->vb.vb2_buf.index); + + if (vid_job_complete) + v4l2_jobqueue_job_finish(&dev->state_hdl_vid_cap.base); } if (vbi_cap_buf) {