From patchwork Tue May 9 15:35:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 98939 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1883660qge; Tue, 9 May 2017 08:36:49 -0700 (PDT) X-Received: by 10.98.144.21 with SMTP id a21mr521609pfe.181.1494344208894; Tue, 09 May 2017 08:36:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494344208; cv=none; d=google.com; s=arc-20160816; b=Ab2j9yDjDDiJ36C5WMuAkr9fWsYBUPeKlofsT4F6tgLMxjOqN4ptjhx7C8g+RcEZwL jAOsi7xY8TGw1zf79AOQgSIrXJU37hF/GeTL45WsT4+WA9yDkXhFgg/P1b+7PD/K1s/P bc2WJ4Sk8FeY/Vod51P1PCSY/XL5GMiP1Z2yAYj7PazgaGjg0lD7wC6M6z56t9f288aq 5GPl+a0S11fkX7MbKuXlWPIJWWJBNwXPhzKhG+ApXA2Xc+uwplyQlwq7ciXBHi2XS3qQ cwX4uA8c+aR842Q3Dl4d/fbpVWHRbwBsSRovMLX9saAHj5mulgPAgxb9rJ1sl7v1ydHS bWXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=77zfL/PZx2AA4+x4qfEFTyKgLMGCoPeUXgKh64P4OXU=; b=phO1EybDW6tivzAD/R4uyvdYPplUBBIaZzi+lbr7Q0etPikgG0VfCQ1A+bY1+XTO0o iSoP9uCdxIxSLArsCwBCxPfj9xsEDFAR2WJHwolEajiv7WbYMLmaPvpH6mBORlSDILFO gfSAlutDYESfaKJsahMpSp/HW5NEqj5wqZZZ3xOGlMtdzyP5qovHdlzlehGchVXHUfiB EFH/kh5nKqKFFui5q5euVSeA/f0t5WLPwuJytfCkYelcXnZYm8hfG4l7fzt9Lw0kIxCD k9JzVkOM2r/GSkFYhmZ5rVUxtcSf+N4cyUYxUALCzrctykuSNdglHQQDAlOj6ouwZF/o 1q6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g7si231251pln.279.2017.05.09.08.36.48; Tue, 09 May 2017 08:36:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754196AbdEIPgo (ORCPT + 25 others); Tue, 9 May 2017 11:36:44 -0400 Received: from mail-wr0-f179.google.com ([209.85.128.179]:32878 "EHLO mail-wr0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754120AbdEIPgm (ORCPT ); Tue, 9 May 2017 11:36:42 -0400 Received: by mail-wr0-f179.google.com with SMTP id w50so4255977wrc.0 for ; Tue, 09 May 2017 08:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=77zfL/PZx2AA4+x4qfEFTyKgLMGCoPeUXgKh64P4OXU=; b=goMh5ITFNjpOCXFfSMLmoJ6Sgm6LQHIeaZ07Ft6YHJyAMHoh4T5UcHK7O3Ata1u71h kiubHV8d2lFt3PUq6DapIeAZ2eZGg56vf+rkTgq8nuvE5sBoduWrX2a1MrkzLt3mRGSa D/pzI02mB89OfWf/yb7ougZU/ioFqoa+bezaY= 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=77zfL/PZx2AA4+x4qfEFTyKgLMGCoPeUXgKh64P4OXU=; b=RFI9672z/BDY5OOoVhskHXx5EXcFmI+48nWdslvGzp6+CtO5GSS9t2jpkcMnwElZIr 1+g8KN3I1h6j9VVqF98KqL8sNZRsZWl8oWP7FPUk7DUUHosHUBzTAu7ZOpK7XvDtgzmd lxhznGrfz/AyXt012liXjC/rMsgjgrEgULWMygnMj3N+IYj6Ug2Y92HkEQKn0DJLX/za FZX8EkJktS6d5SRS7roKg/scF1OYYTrEYKZIoro/utbdEFiCRUjw+OKXYvX5KQhNj2qY Vjvc77pKXe10B00Md5/m8KU3VGY/gZPPeTOUNj+HU02paHIzKrvLcTj+rlEOQJJHelLH EIOA== X-Gm-Message-State: AODbwcAefWrFoCQ9kMlwBikaWj7xEB1bA8ZAUEvpjS2j+R02JyFq8FSV Yvvj1XzJl86Ff/xu X-Received: by 10.223.128.208 with SMTP id 74mr478869wrl.2.1494344200871; Tue, 09 May 2017 08:36:40 -0700 (PDT) Received: from mms-0440.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id b93sm272672wrd.29.2017.05.09.08.36.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 May 2017 08:36:40 -0700 (PDT) From: Stanimir Varbanov To: Mauro Carvalho Chehab , Hans Verkuil Cc: Andy Gross , Bjorn Andersson , Stephen Boyd , Srinivas Kandagatla , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Stanimir Varbanov Subject: [PATCH v9 1/9] media: v4l2-mem2mem: extend m2m APIs for more accurate buffer management Date: Tue, 9 May 2017 18:35:53 +0300 Message-Id: <1494344161-28131-2-git-send-email-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494344161-28131-1-git-send-email-stanimir.varbanov@linaro.org> References: <1494344161-28131-1-git-send-email-stanimir.varbanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org this add functions for: - remove buffers from src/dst queue by index - remove exact buffer from src/dst queue also extends m2m API to iterate over a list of src/dst buffers in safely and non-safely manner. Reviewed-by: Hans Verkuil Signed-off-by: Stanimir Varbanov --- drivers/media/v4l2-core/v4l2-mem2mem.c | 37 ++++++++++++++ include/media/v4l2-mem2mem.h | 92 ++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+) -- 2.7.4 diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c index 6bc27e7b2a33..f62e68aa04c4 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -126,6 +126,43 @@ void *v4l2_m2m_buf_remove(struct v4l2_m2m_queue_ctx *q_ctx) } EXPORT_SYMBOL_GPL(v4l2_m2m_buf_remove); +void v4l2_m2m_buf_remove_by_buf(struct v4l2_m2m_queue_ctx *q_ctx, + struct vb2_v4l2_buffer *vbuf) +{ + struct v4l2_m2m_buffer *b; + unsigned long flags; + + spin_lock_irqsave(&q_ctx->rdy_spinlock, flags); + b = container_of(vbuf, struct v4l2_m2m_buffer, vb); + list_del(&b->list); + q_ctx->num_rdy--; + spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags); +} +EXPORT_SYMBOL_GPL(v4l2_m2m_buf_remove_by_buf); + +struct vb2_v4l2_buffer * +v4l2_m2m_buf_remove_by_idx(struct v4l2_m2m_queue_ctx *q_ctx, unsigned int idx) + +{ + struct v4l2_m2m_buffer *b, *tmp; + struct vb2_v4l2_buffer *ret = NULL; + unsigned long flags; + + spin_lock_irqsave(&q_ctx->rdy_spinlock, flags); + list_for_each_entry_safe(b, tmp, &q_ctx->rdy_queue, list) { + if (b->vb.vb2_buf.index == idx) { + list_del(&b->list); + q_ctx->num_rdy--; + ret = &b->vb; + break; + } + } + spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags); + + return ret; +} +EXPORT_SYMBOL_GPL(v4l2_m2m_buf_remove_by_idx); + /* * Scheduling handlers */ diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h index 3ccd01bd245e..e157d5c9b224 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -437,6 +437,47 @@ static inline void *v4l2_m2m_next_dst_buf(struct v4l2_m2m_ctx *m2m_ctx) } /** + * v4l2_m2m_for_each_dst_buf() - iterate over a list of destination ready + * buffers + * + * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx + * @b: current buffer of type struct v4l2_m2m_buffer + */ +#define v4l2_m2m_for_each_dst_buf(m2m_ctx, b) \ + list_for_each_entry(b, &m2m_ctx->cap_q_ctx.rdy_queue, list) + +/** + * v4l2_m2m_for_each_src_buf() - iterate over a list of source ready buffers + * + * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx + * @b: current buffer of type struct v4l2_m2m_buffer + */ +#define v4l2_m2m_for_each_src_buf(m2m_ctx, b) \ + list_for_each_entry(b, &m2m_ctx->out_q_ctx.rdy_queue, list) + +/** + * v4l2_m2m_for_each_dst_buf_safe() - iterate over a list of destination ready + * buffers safely + * + * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx + * @b: current buffer of type struct v4l2_m2m_buffer + * @n: used as temporary storage + */ +#define v4l2_m2m_for_each_dst_buf_safe(m2m_ctx, b, n) \ + list_for_each_entry_safe(b, n, &m2m_ctx->cap_q_ctx.rdy_queue, list) + +/** + * v4l2_m2m_for_each_src_buf_safe() - iterate over a list of source ready + * buffers safely + * + * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx + * @b: current buffer of type struct v4l2_m2m_buffer + * @n: used as temporary storage + */ +#define v4l2_m2m_for_each_src_buf_safe(m2m_ctx, b, n) \ + list_for_each_entry_safe(b, n, &m2m_ctx->out_q_ctx.rdy_queue, list) + +/** * v4l2_m2m_get_src_vq() - return vb2_queue for source buffers * * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx @@ -488,6 +529,57 @@ static inline void *v4l2_m2m_dst_buf_remove(struct v4l2_m2m_ctx *m2m_ctx) return v4l2_m2m_buf_remove(&m2m_ctx->cap_q_ctx); } +/** + * v4l2_m2m_buf_remove_by_buf() - take off exact buffer from the list of ready + * buffers + * + * @q_ctx: pointer to struct @v4l2_m2m_queue_ctx + * @vbuf: the buffer to be removed + */ +void v4l2_m2m_buf_remove_by_buf(struct v4l2_m2m_queue_ctx *q_ctx, + struct vb2_v4l2_buffer *vbuf); + +/** + * v4l2_m2m_src_buf_remove_by_buf() - take off exact source buffer from the list + * of ready buffers + * + * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx + * @vbuf: the buffer to be removed + */ +static inline void v4l2_m2m_src_buf_remove_by_buf(struct v4l2_m2m_ctx *m2m_ctx, + struct vb2_v4l2_buffer *vbuf) +{ + v4l2_m2m_buf_remove_by_buf(&m2m_ctx->out_q_ctx, vbuf); +} + +/** + * v4l2_m2m_dst_buf_remove_by_buf() - take off exact destination buffer from the + * list of ready buffers + * + * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx + * @vbuf: the buffer to be removed + */ +static inline void v4l2_m2m_dst_buf_remove_by_buf(struct v4l2_m2m_ctx *m2m_ctx, + struct vb2_v4l2_buffer *vbuf) +{ + v4l2_m2m_buf_remove_by_buf(&m2m_ctx->cap_q_ctx, vbuf); +} + +struct vb2_v4l2_buffer * +v4l2_m2m_buf_remove_by_idx(struct v4l2_m2m_queue_ctx *q_ctx, unsigned int idx); + +static inline struct vb2_v4l2_buffer * +v4l2_m2m_src_buf_remove_by_idx(struct v4l2_m2m_ctx *m2m_ctx, unsigned int idx) +{ + return v4l2_m2m_buf_remove_by_idx(&m2m_ctx->out_q_ctx, idx); +} + +static inline struct vb2_v4l2_buffer * +v4l2_m2m_dst_buf_remove_by_idx(struct v4l2_m2m_ctx *m2m_ctx, unsigned int idx) +{ + return v4l2_m2m_buf_remove_by_idx(&m2m_ctx->cap_q_ctx, idx); +} + /* v4l2 ioctl helpers */ int v4l2_m2m_ioctl_reqbufs(struct file *file, void *priv,