| Message ID | 20231109163512.179524-31-benjamin.gaignard@collabora.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp559193vqs;
Thu, 9 Nov 2023 08:39:23 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IFuS4P3TdRh4FPtQa/F7MiZIxglzuEmVlm6F6TCSwNWCT6GLPhhF/VkR/bnELqFzaLS4uJ/
X-Received: by 2002:a05:6808:1b1f:b0:3a9:c25d:176a with SMTP id
bx31-20020a0568081b1f00b003a9c25d176amr2527462oib.36.1699547962775;
Thu, 09 Nov 2023 08:39:22 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1699547962; cv=none;
d=google.com; s=arc-20160816;
b=E+PkWC3JjvJS4mCpgQcOg6ALKc8jFUBWaf9P085smdxb5r6vj/GmnQZ9JKYdgGJfM4
Q17VYb7UIAKYXZoj3tpN/T0lhNPKtX+pdRQjJod+ffO+jwrwQZmd/tvIhOiIFXRA7RjC
x/E0tOwfI5L8BjYLIeT+6s/EWXV3S1ysJ3DNI/FRFQqwdU5leWACAbcsRSLXa/y1CoY+
h2hAvAvPQh2HuLD4BWpJHcasm7cRFJZiXFSh2PMMHryPxkt3cf8eazMVeRX58H41wV7L
NZyHUCzhctc4tb707dfIsxGzrNT2ahdnAZsPgLzEHWHQ/TOAIHJ8h9RqbqkSxxmU2CT6
7esA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:from
:dkim-signature;
bh=S7wSKWKWMTqH/Bus/3RYYbqGQCjdgpU09DLj5YI5PTo=;
fh=R7B7Bon9pv+GFCDou9bQ9Fb3T633P/NGL4WG9w9NtOc=;
b=XjanOQnGmFKF80zxsi5xBc4HO/8d4JKOswu9lPfi8V+caLcWiRXKMIJa7gA8a9im1A
BERbxHiqJ6icItjpA25jD4CmOte8oSitP/2Bpc37fGeVVYoUwn54WWCCIOnd0NWgmtPz
xFONGWD3DjcGBpahI121IqjBJcMwreNbUBzTbmmAmhmn/3O5oGA5pvEW8XtwYiMiyNsS
RshTObgF6+5yA65Y1VcXEdlnFHegx1XWd+XvDDJMi7jZIvyST+cOydJlQbgElCvXSRbV
tjdsWPutMiJ4a+7p6PWdyXgYJERNm2XfcdnHqz3w49Zw6Ndyz72ydBWg2zFswsVxlFhj
D5Ug==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=Kcmhkk1k;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE)
header.from=collabora.com
Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7])
by mx.google.com with ESMTPS id
by16-20020a056a02059000b005b7e70085dcsi8587323pgb.433.2023.11.09.08.39.22
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 09 Nov 2023 08:39:22 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 as permitted sender)
client-ip=2620:137:e000::3:7;
Authentication-Results: mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=Kcmhkk1k;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:7 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE)
header.from=collabora.com
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by snail.vger.email (Postfix) with ESMTP id 84BB1837C4B7;
Thu, 9 Nov 2023 08:39:21 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1344511AbjKIQjP (ORCPT <rfc822;lhua1029@gmail.com> + 31 others);
Thu, 9 Nov 2023 11:39:15 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37460 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1344778AbjKIQi2 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 9 Nov 2023 11:38:28 -0500
Received: from madras.collabora.co.uk (madras.collabora.co.uk
[IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4CF74206;
Thu, 9 Nov 2023 08:38:08 -0800 (PST)
Received: from benjamin-XPS-13-9310.. (cola.collaboradmins.com
[195.201.22.229])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
(Authenticated sender: benjamin.gaignard)
by madras.collabora.co.uk (Postfix) with ESMTPSA id B877E66076AB;
Thu, 9 Nov 2023 16:38:06 +0000 (GMT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com;
s=mail; t=1699547887;
bh=eyfPu50sRHV6KEm2QbIfFHbDvRZROfqB2uRRUdMPqbc=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=Kcmhkk1kZl9RGhKWERWLXLhSm5O6JbVncoJWraUoQnhonkqTOrxDO1GcQEikCryH1
AFgZxHVoEPH3YkGyfT2W7KzFXY93LsPPl94CnFZrGVae07Wm6LUPwTVaEiDuB8qtg3
wIhEmuXWWdwFr8WdFyPVLYVPtWxF5D7tugGeSTdmPCnLBM7pg3zIo9It32ZAASuFK1
k7vVWQW7V9/r+ZaVjw+olAQZutaS04OjhunrHocS9vXONh0J2mpZQVR6Yrj4dDktHK
IlnpZFo+kZK2/5YwmrLjilRD9tNAtLn0/T+pKZihLvOzfQWTEmo1MhXTi964RkxzQQ
TtMhk3Z3Q251A==
From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
To: mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com,
ming.qian@nxp.com, ezequiel@vanguardiasur.com.ar,
p.zabel@pengutronix.de, gregkh@linuxfoundation.org,
hverkuil-cisco@xs4all.nl, nicolas.dufresne@collabora.com
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org,
linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev,
kernel@collabora.com,
Benjamin Gaignard <benjamin.gaignard@collabora.com>,
Daniel Almeida <daniel.almeida@collabora.com>
Subject: [PATCH v15 30/56] media: test-drivers: Stop direct calls to queue
num_buffers field
Date: Thu, 9 Nov 2023 17:34:46 +0100
Message-Id: <20231109163512.179524-31-benjamin.gaignard@collabora.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20231109163512.179524-14-benjamin.gaignard@collabora.com>
References: <20231109163512.179524-14-benjamin.gaignard@collabora.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]);
Thu, 09 Nov 2023 08:39:21 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1782105204467968864
X-GMAIL-MSGID: 1782105204467968864
|
| Series |
Add DELETE_BUF ioctl
|
|
Commit Message
Benjamin Gaignard
Nov. 9, 2023, 4:34 p.m. UTC
Use vb2_get_num_buffers() to avoid using queue num_buffers field directly.
This allows us to change how the number of buffers is computed in the
future.
If 'min_buffers_needed' is set remove useless checks in queue setup
functions.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
CC: Daniel Almeida <daniel.almeida@collabora.com>
---
drivers/media/test-drivers/visl/visl-dec.c | 4 ++--
drivers/media/test-drivers/vivid/vivid-meta-cap.c | 3 ---
drivers/media/test-drivers/vivid/vivid-meta-out.c | 5 +++--
drivers/media/test-drivers/vivid/vivid-touch-cap.c | 5 +++--
drivers/media/test-drivers/vivid/vivid-vbi-cap.c | 3 ---
drivers/media/test-drivers/vivid/vivid-vbi-out.c | 3 ---
drivers/media/test-drivers/vivid/vivid-vid-cap.c | 3 ---
drivers/media/test-drivers/vivid/vivid-vid-out.c | 5 +----
8 files changed, 9 insertions(+), 22 deletions(-)
Comments
Hi Benjamin, W dniu 9.11.2023 o 17:34, Benjamin Gaignard pisze: > Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. > This allows us to change how the number of buffers is computed in the > future. > If 'min_buffers_needed' is set remove useless checks in queue setup > functions. > > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> > CC: Daniel Almeida <daniel.almeida@collabora.com> > --- > drivers/media/test-drivers/visl/visl-dec.c | 4 ++-- > drivers/media/test-drivers/vivid/vivid-meta-cap.c | 3 --- > drivers/media/test-drivers/vivid/vivid-meta-out.c | 5 +++-- > drivers/media/test-drivers/vivid/vivid-touch-cap.c | 5 +++-- > drivers/media/test-drivers/vivid/vivid-vbi-cap.c | 3 --- > drivers/media/test-drivers/vivid/vivid-vbi-out.c | 3 --- > drivers/media/test-drivers/vivid/vivid-vid-cap.c | 3 --- > drivers/media/test-drivers/vivid/vivid-vid-out.c | 5 +---- > 8 files changed, 9 insertions(+), 22 deletions(-) > > diff --git a/drivers/media/test-drivers/visl/visl-dec.c b/drivers/media/test-drivers/visl/visl-dec.c > index ba20ea998d19..4672dc5e52bb 100644 > --- a/drivers/media/test-drivers/visl/visl-dec.c > +++ b/drivers/media/test-drivers/visl/visl-dec.c > @@ -287,7 +287,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run) > frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf); > > len = 0; > - for (i = 0; i < out_q->num_buffers; i++) { > + for (i = 0; i < vb2_get_num_buffers(out_q); i++) { > char entry[] = "index: %u, state: %s, request_fd: %d, "; > u32 old_len = len; > struct vb2_buffer *vb2; > @@ -347,7 +347,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run) > frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf); > > len = 0; > - for (i = 0; i < cap_q->num_buffers; i++) { > + for (i = 0; i < vb2_get_num_buffers(cap_q); i++) { > u32 old_len = len; > struct vb2_buffer *vb2; > char *q_status; > diff --git a/drivers/media/test-drivers/vivid/vivid-meta-cap.c b/drivers/media/test-drivers/vivid/vivid-meta-cap.c > index 780f96860a6d..0a718d037e59 100644 > --- a/drivers/media/test-drivers/vivid/vivid-meta-cap.c > +++ b/drivers/media/test-drivers/vivid/vivid-meta-cap.c > @@ -30,9 +30,6 @@ static int meta_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, > sizes[0] = size; > } > > - if (vq->num_buffers + *nbuffers < 2) > - *nbuffers = 2 - vq->num_buffers; > - > *nplanes = 1; > return 0; > } > diff --git a/drivers/media/test-drivers/vivid/vivid-meta-out.c b/drivers/media/test-drivers/vivid/vivid-meta-out.c > index 95835b52b58f..4a569a6e58be 100644 > --- a/drivers/media/test-drivers/vivid/vivid-meta-out.c > +++ b/drivers/media/test-drivers/vivid/vivid-meta-out.c > @@ -18,6 +18,7 @@ static int meta_out_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, > struct device *alloc_devs[]) > { > struct vivid_dev *dev = vb2_get_drv_priv(vq); > + unsigned int q_num_bufs = vb2_get_num_buffers(vq); > unsigned int size = sizeof(struct vivid_meta_out_buf); > > if (!vivid_is_webcam(dev)) > @@ -30,8 +31,8 @@ static int meta_out_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, > sizes[0] = size; > } > > - if (vq->num_buffers + *nbuffers < 2) > - *nbuffers = 2 - vq->num_buffers; > + if (q_num_bufs + *nbuffers < 2) > + *nbuffers = 2 - q_num_bufs; > > *nplanes = 1; > return 0; > diff --git a/drivers/media/test-drivers/vivid/vivid-touch-cap.c b/drivers/media/test-drivers/vivid/vivid-touch-cap.c > index c7f6e23df51e..4b3c6ea0afde 100644 > --- a/drivers/media/test-drivers/vivid/vivid-touch-cap.c > +++ b/drivers/media/test-drivers/vivid/vivid-touch-cap.c > @@ -13,6 +13,7 @@ static int touch_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, > struct device *alloc_devs[]) > { > struct vivid_dev *dev = vb2_get_drv_priv(vq); > + unsigned int q_num_bufs = vb2_get_num_buffers(vq); > struct v4l2_pix_format *f = &dev->tch_format; > unsigned int size = f->sizeimage; > > @@ -23,8 +24,8 @@ static int touch_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, > sizes[0] = size; > } > > - if (vq->num_buffers + *nbuffers < 2) > - *nbuffers = 2 - vq->num_buffers; > + if (q_num_bufs + *nbuffers < 2) > + *nbuffers = 2 - q_num_bufs; > > *nplanes = 1; > return 0; > diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c > index b65b02eeeb97..3840b3a664ac 100644 > --- a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c > +++ b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c > @@ -134,9 +134,6 @@ static int vbi_cap_queue_setup(struct vb2_queue *vq, > > sizes[0] = size; > > - if (vq->num_buffers + *nbuffers < 2) > - *nbuffers = 2 - vq->num_buffers; > - > *nplanes = 1; > return 0; > } > diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-out.c b/drivers/media/test-drivers/vivid/vivid-vbi-out.c > index cd56476902a2..434a10676417 100644 > --- a/drivers/media/test-drivers/vivid/vivid-vbi-out.c > +++ b/drivers/media/test-drivers/vivid/vivid-vbi-out.c > @@ -30,9 +30,6 @@ static int vbi_out_queue_setup(struct vb2_queue *vq, > > sizes[0] = size; > > - if (vq->num_buffers + *nbuffers < 2) > - *nbuffers = 2 - vq->num_buffers; > - > *nplanes = 1; > return 0; > } > diff --git a/drivers/media/test-drivers/vivid/vivid-vid-cap.c b/drivers/media/test-drivers/vivid/vivid-vid-cap.c > index 3a06df35a2d7..2804975fe278 100644 > --- a/drivers/media/test-drivers/vivid/vivid-vid-cap.c > +++ b/drivers/media/test-drivers/vivid/vivid-vid-cap.c > @@ -117,9 +117,6 @@ static int vid_cap_queue_setup(struct vb2_queue *vq, > dev->fmt_cap->data_offset[p]; > } > > - if (vq->num_buffers + *nbuffers < 2) > - *nbuffers = 2 - vq->num_buffers; > - > *nplanes = buffers; > > dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers); here the format specifier for "*nbuffers" is "%d"... > diff --git a/drivers/media/test-drivers/vivid/vivid-vid-out.c b/drivers/media/test-drivers/vivid/vivid-vid-out.c > index 184a6df2c29f..1653b2988f7e 100644 > --- a/drivers/media/test-drivers/vivid/vivid-vid-out.c > +++ b/drivers/media/test-drivers/vivid/vivid-vid-out.c > @@ -73,12 +73,9 @@ static int vid_out_queue_setup(struct vb2_queue *vq, > vfmt->data_offset[p] : size; > } > > - if (vq->num_buffers + *nbuffers < 2) > - *nbuffers = 2 - vq->num_buffers; > - > *nplanes = planes; > > - dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers); > + dprintk(dev, 1, "%s: count=%u\n", __func__, *nbuffers); ... but here you change it to "%u". Is there a reason for these two to be different? I didn't notice it in the previous version but now it stands out clearly. Probably you changed to %u because of the type returned by vb2_get_num_buffers(). And, actually, *nbuffers _is_ unsigned, too. Regards, Andrzej > for (p = 0; p < planes; p++) > dprintk(dev, 1, "%s: size[%u]=%u\n", __func__, p, sizes[p]); > return 0;
Le 10/11/2023 à 10:35, Andrzej Pietrasiewicz a écrit : > Hi Benjamin, > > W dniu 9.11.2023 o 17:34, Benjamin Gaignard pisze: >> Use vb2_get_num_buffers() to avoid using queue num_buffers field >> directly. >> This allows us to change how the number of buffers is computed in the >> future. >> If 'min_buffers_needed' is set remove useless checks in queue setup >> functions. >> >> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> >> CC: Daniel Almeida <daniel.almeida@collabora.com> >> --- >> drivers/media/test-drivers/visl/visl-dec.c | 4 ++-- >> drivers/media/test-drivers/vivid/vivid-meta-cap.c | 3 --- >> drivers/media/test-drivers/vivid/vivid-meta-out.c | 5 +++-- >> drivers/media/test-drivers/vivid/vivid-touch-cap.c | 5 +++-- >> drivers/media/test-drivers/vivid/vivid-vbi-cap.c | 3 --- >> drivers/media/test-drivers/vivid/vivid-vbi-out.c | 3 --- >> drivers/media/test-drivers/vivid/vivid-vid-cap.c | 3 --- >> drivers/media/test-drivers/vivid/vivid-vid-out.c | 5 +---- >> 8 files changed, 9 insertions(+), 22 deletions(-) >> >> diff --git a/drivers/media/test-drivers/visl/visl-dec.c >> b/drivers/media/test-drivers/visl/visl-dec.c >> index ba20ea998d19..4672dc5e52bb 100644 >> --- a/drivers/media/test-drivers/visl/visl-dec.c >> +++ b/drivers/media/test-drivers/visl/visl-dec.c >> @@ -287,7 +287,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx, >> struct visl_run *run) >> frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf); >> len = 0; >> - for (i = 0; i < out_q->num_buffers; i++) { >> + for (i = 0; i < vb2_get_num_buffers(out_q); i++) { >> char entry[] = "index: %u, state: %s, request_fd: %d, "; >> u32 old_len = len; >> struct vb2_buffer *vb2; >> @@ -347,7 +347,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx, >> struct visl_run *run) >> frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf); >> len = 0; >> - for (i = 0; i < cap_q->num_buffers; i++) { >> + for (i = 0; i < vb2_get_num_buffers(cap_q); i++) { >> u32 old_len = len; >> struct vb2_buffer *vb2; >> char *q_status; >> diff --git a/drivers/media/test-drivers/vivid/vivid-meta-cap.c >> b/drivers/media/test-drivers/vivid/vivid-meta-cap.c >> index 780f96860a6d..0a718d037e59 100644 >> --- a/drivers/media/test-drivers/vivid/vivid-meta-cap.c >> +++ b/drivers/media/test-drivers/vivid/vivid-meta-cap.c >> @@ -30,9 +30,6 @@ static int meta_cap_queue_setup(struct vb2_queue >> *vq, unsigned int *nbuffers, >> sizes[0] = size; >> } >> - if (vq->num_buffers + *nbuffers < 2) >> - *nbuffers = 2 - vq->num_buffers; >> - >> *nplanes = 1; >> return 0; >> } >> diff --git a/drivers/media/test-drivers/vivid/vivid-meta-out.c >> b/drivers/media/test-drivers/vivid/vivid-meta-out.c >> index 95835b52b58f..4a569a6e58be 100644 >> --- a/drivers/media/test-drivers/vivid/vivid-meta-out.c >> +++ b/drivers/media/test-drivers/vivid/vivid-meta-out.c >> @@ -18,6 +18,7 @@ static int meta_out_queue_setup(struct vb2_queue >> *vq, unsigned int *nbuffers, >> struct device *alloc_devs[]) >> { >> struct vivid_dev *dev = vb2_get_drv_priv(vq); >> + unsigned int q_num_bufs = vb2_get_num_buffers(vq); >> unsigned int size = sizeof(struct vivid_meta_out_buf); >> if (!vivid_is_webcam(dev)) >> @@ -30,8 +31,8 @@ static int meta_out_queue_setup(struct vb2_queue >> *vq, unsigned int *nbuffers, >> sizes[0] = size; >> } >> - if (vq->num_buffers + *nbuffers < 2) >> - *nbuffers = 2 - vq->num_buffers; >> + if (q_num_bufs + *nbuffers < 2) >> + *nbuffers = 2 - q_num_bufs; >> *nplanes = 1; >> return 0; >> diff --git a/drivers/media/test-drivers/vivid/vivid-touch-cap.c >> b/drivers/media/test-drivers/vivid/vivid-touch-cap.c >> index c7f6e23df51e..4b3c6ea0afde 100644 >> --- a/drivers/media/test-drivers/vivid/vivid-touch-cap.c >> +++ b/drivers/media/test-drivers/vivid/vivid-touch-cap.c >> @@ -13,6 +13,7 @@ static int touch_cap_queue_setup(struct vb2_queue >> *vq, unsigned int *nbuffers, >> struct device *alloc_devs[]) >> { >> struct vivid_dev *dev = vb2_get_drv_priv(vq); >> + unsigned int q_num_bufs = vb2_get_num_buffers(vq); >> struct v4l2_pix_format *f = &dev->tch_format; >> unsigned int size = f->sizeimage; >> @@ -23,8 +24,8 @@ static int touch_cap_queue_setup(struct vb2_queue >> *vq, unsigned int *nbuffers, >> sizes[0] = size; >> } >> - if (vq->num_buffers + *nbuffers < 2) >> - *nbuffers = 2 - vq->num_buffers; >> + if (q_num_bufs + *nbuffers < 2) >> + *nbuffers = 2 - q_num_bufs; >> *nplanes = 1; >> return 0; >> diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c >> b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c >> index b65b02eeeb97..3840b3a664ac 100644 >> --- a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c >> +++ b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c >> @@ -134,9 +134,6 @@ static int vbi_cap_queue_setup(struct vb2_queue *vq, >> sizes[0] = size; >> - if (vq->num_buffers + *nbuffers < 2) >> - *nbuffers = 2 - vq->num_buffers; >> - >> *nplanes = 1; >> return 0; >> } >> diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-out.c >> b/drivers/media/test-drivers/vivid/vivid-vbi-out.c >> index cd56476902a2..434a10676417 100644 >> --- a/drivers/media/test-drivers/vivid/vivid-vbi-out.c >> +++ b/drivers/media/test-drivers/vivid/vivid-vbi-out.c >> @@ -30,9 +30,6 @@ static int vbi_out_queue_setup(struct vb2_queue *vq, >> sizes[0] = size; >> - if (vq->num_buffers + *nbuffers < 2) >> - *nbuffers = 2 - vq->num_buffers; >> - >> *nplanes = 1; >> return 0; >> } >> diff --git a/drivers/media/test-drivers/vivid/vivid-vid-cap.c >> b/drivers/media/test-drivers/vivid/vivid-vid-cap.c >> index 3a06df35a2d7..2804975fe278 100644 >> --- a/drivers/media/test-drivers/vivid/vivid-vid-cap.c >> +++ b/drivers/media/test-drivers/vivid/vivid-vid-cap.c >> @@ -117,9 +117,6 @@ static int vid_cap_queue_setup(struct vb2_queue *vq, >> dev->fmt_cap->data_offset[p]; >> } >> - if (vq->num_buffers + *nbuffers < 2) >> - *nbuffers = 2 - vq->num_buffers; >> - >> *nplanes = buffers; >> dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers); > > here the format specifier for "*nbuffers" is "%d"... > >> diff --git a/drivers/media/test-drivers/vivid/vivid-vid-out.c >> b/drivers/media/test-drivers/vivid/vivid-vid-out.c >> index 184a6df2c29f..1653b2988f7e 100644 >> --- a/drivers/media/test-drivers/vivid/vivid-vid-out.c >> +++ b/drivers/media/test-drivers/vivid/vivid-vid-out.c >> @@ -73,12 +73,9 @@ static int vid_out_queue_setup(struct vb2_queue *vq, >> vfmt->data_offset[p] : size; >> } >> - if (vq->num_buffers + *nbuffers < 2) >> - *nbuffers = 2 - vq->num_buffers; >> - >> *nplanes = planes; >> - dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers); >> + dprintk(dev, 1, "%s: count=%u\n", __func__, *nbuffers); > > ... but here you change it to "%u". Is there a reason for these two to be > different? I didn't notice it in the previous version but now it > stands out > clearly. Probably you changed to %u because of the type returned by > vb2_get_num_buffers(). And, actually, *nbuffers _is_ unsigned, too. Like you said *nbuffers is unsigned so %u sound for me. The goal of this patch was to avoid vq->num_buffers usage not to clean up all the file. That could be done in other patch since there is lot to do here. Regards, Benjamin > > Regards, > > Andrzej > >> for (p = 0; p < planes; p++) >> dprintk(dev, 1, "%s: size[%u]=%u\n", __func__, p, sizes[p]); >> return 0; >
Hi Benjamin, W dniu 10.11.2023 o 10:55, Benjamin Gaignard pisze: > > Le 10/11/2023 à 10:35, Andrzej Pietrasiewicz a écrit : >> Hi Benjamin, >> >> W dniu 9.11.2023 o 17:34, Benjamin Gaignard pisze: >>> Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. >>> This allows us to change how the number of buffers is computed in the >>> future. >>> If 'min_buffers_needed' is set remove useless checks in queue setup >>> functions. >>> >>> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> >>> CC: Daniel Almeida <daniel.almeida@collabora.com> >>> --- >>> drivers/media/test-drivers/visl/visl-dec.c | 4 ++-- >>> drivers/media/test-drivers/vivid/vivid-meta-cap.c | 3 --- >>> drivers/media/test-drivers/vivid/vivid-meta-out.c | 5 +++-- >>> drivers/media/test-drivers/vivid/vivid-touch-cap.c | 5 +++-- >>> drivers/media/test-drivers/vivid/vivid-vbi-cap.c | 3 --- >>> drivers/media/test-drivers/vivid/vivid-vbi-out.c | 3 --- >>> drivers/media/test-drivers/vivid/vivid-vid-cap.c | 3 --- >>> drivers/media/test-drivers/vivid/vivid-vid-out.c | 5 +---- >>> 8 files changed, 9 insertions(+), 22 deletions(-) >>> >>> diff --git a/drivers/media/test-drivers/visl/visl-dec.c >>> b/drivers/media/test-drivers/visl/visl-dec.c >>> index ba20ea998d19..4672dc5e52bb 100644 >>> --- a/drivers/media/test-drivers/visl/visl-dec.c >>> +++ b/drivers/media/test-drivers/visl/visl-dec.c >>> @@ -287,7 +287,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct >>> visl_run *run) >>> frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf); >>> len = 0; >>> - for (i = 0; i < out_q->num_buffers; i++) { >>> + for (i = 0; i < vb2_get_num_buffers(out_q); i++) { >>> char entry[] = "index: %u, state: %s, request_fd: %d, "; >>> u32 old_len = len; >>> struct vb2_buffer *vb2; >>> @@ -347,7 +347,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct >>> visl_run *run) >>> frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf); >>> len = 0; >>> - for (i = 0; i < cap_q->num_buffers; i++) { >>> + for (i = 0; i < vb2_get_num_buffers(cap_q); i++) { >>> u32 old_len = len; >>> struct vb2_buffer *vb2; >>> char *q_status; >>> diff --git a/drivers/media/test-drivers/vivid/vivid-meta-cap.c >>> b/drivers/media/test-drivers/vivid/vivid-meta-cap.c >>> index 780f96860a6d..0a718d037e59 100644 >>> --- a/drivers/media/test-drivers/vivid/vivid-meta-cap.c >>> +++ b/drivers/media/test-drivers/vivid/vivid-meta-cap.c >>> @@ -30,9 +30,6 @@ static int meta_cap_queue_setup(struct vb2_queue *vq, >>> unsigned int *nbuffers, >>> sizes[0] = size; >>> } >>> - if (vq->num_buffers + *nbuffers < 2) >>> - *nbuffers = 2 - vq->num_buffers; >>> - >>> *nplanes = 1; >>> return 0; >>> } >>> diff --git a/drivers/media/test-drivers/vivid/vivid-meta-out.c >>> b/drivers/media/test-drivers/vivid/vivid-meta-out.c >>> index 95835b52b58f..4a569a6e58be 100644 >>> --- a/drivers/media/test-drivers/vivid/vivid-meta-out.c >>> +++ b/drivers/media/test-drivers/vivid/vivid-meta-out.c >>> @@ -18,6 +18,7 @@ static int meta_out_queue_setup(struct vb2_queue *vq, >>> unsigned int *nbuffers, >>> struct device *alloc_devs[]) >>> { >>> struct vivid_dev *dev = vb2_get_drv_priv(vq); >>> + unsigned int q_num_bufs = vb2_get_num_buffers(vq); >>> unsigned int size = sizeof(struct vivid_meta_out_buf); >>> if (!vivid_is_webcam(dev)) >>> @@ -30,8 +31,8 @@ static int meta_out_queue_setup(struct vb2_queue *vq, >>> unsigned int *nbuffers, >>> sizes[0] = size; >>> } >>> - if (vq->num_buffers + *nbuffers < 2) >>> - *nbuffers = 2 - vq->num_buffers; >>> + if (q_num_bufs + *nbuffers < 2) >>> + *nbuffers = 2 - q_num_bufs; >>> *nplanes = 1; >>> return 0; >>> diff --git a/drivers/media/test-drivers/vivid/vivid-touch-cap.c >>> b/drivers/media/test-drivers/vivid/vivid-touch-cap.c >>> index c7f6e23df51e..4b3c6ea0afde 100644 >>> --- a/drivers/media/test-drivers/vivid/vivid-touch-cap.c >>> +++ b/drivers/media/test-drivers/vivid/vivid-touch-cap.c >>> @@ -13,6 +13,7 @@ static int touch_cap_queue_setup(struct vb2_queue *vq, >>> unsigned int *nbuffers, >>> struct device *alloc_devs[]) >>> { >>> struct vivid_dev *dev = vb2_get_drv_priv(vq); >>> + unsigned int q_num_bufs = vb2_get_num_buffers(vq); >>> struct v4l2_pix_format *f = &dev->tch_format; >>> unsigned int size = f->sizeimage; >>> @@ -23,8 +24,8 @@ static int touch_cap_queue_setup(struct vb2_queue *vq, >>> unsigned int *nbuffers, >>> sizes[0] = size; >>> } >>> - if (vq->num_buffers + *nbuffers < 2) >>> - *nbuffers = 2 - vq->num_buffers; >>> + if (q_num_bufs + *nbuffers < 2) >>> + *nbuffers = 2 - q_num_bufs; >>> *nplanes = 1; >>> return 0; >>> diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c >>> b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c >>> index b65b02eeeb97..3840b3a664ac 100644 >>> --- a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c >>> +++ b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c >>> @@ -134,9 +134,6 @@ static int vbi_cap_queue_setup(struct vb2_queue *vq, >>> sizes[0] = size; >>> - if (vq->num_buffers + *nbuffers < 2) >>> - *nbuffers = 2 - vq->num_buffers; >>> - >>> *nplanes = 1; >>> return 0; >>> } >>> diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-out.c >>> b/drivers/media/test-drivers/vivid/vivid-vbi-out.c >>> index cd56476902a2..434a10676417 100644 >>> --- a/drivers/media/test-drivers/vivid/vivid-vbi-out.c >>> +++ b/drivers/media/test-drivers/vivid/vivid-vbi-out.c >>> @@ -30,9 +30,6 @@ static int vbi_out_queue_setup(struct vb2_queue *vq, >>> sizes[0] = size; >>> - if (vq->num_buffers + *nbuffers < 2) >>> - *nbuffers = 2 - vq->num_buffers; >>> - >>> *nplanes = 1; >>> return 0; >>> } >>> diff --git a/drivers/media/test-drivers/vivid/vivid-vid-cap.c >>> b/drivers/media/test-drivers/vivid/vivid-vid-cap.c >>> index 3a06df35a2d7..2804975fe278 100644 >>> --- a/drivers/media/test-drivers/vivid/vivid-vid-cap.c >>> +++ b/drivers/media/test-drivers/vivid/vivid-vid-cap.c >>> @@ -117,9 +117,6 @@ static int vid_cap_queue_setup(struct vb2_queue *vq, >>> dev->fmt_cap->data_offset[p]; >>> } >>> - if (vq->num_buffers + *nbuffers < 2) >>> - *nbuffers = 2 - vq->num_buffers; >>> - >>> *nplanes = buffers; >>> dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers); >> >> here the format specifier for "*nbuffers" is "%d"... >> >>> diff --git a/drivers/media/test-drivers/vivid/vivid-vid-out.c >>> b/drivers/media/test-drivers/vivid/vivid-vid-out.c >>> index 184a6df2c29f..1653b2988f7e 100644 >>> --- a/drivers/media/test-drivers/vivid/vivid-vid-out.c >>> +++ b/drivers/media/test-drivers/vivid/vivid-vid-out.c >>> @@ -73,12 +73,9 @@ static int vid_out_queue_setup(struct vb2_queue *vq, >>> vfmt->data_offset[p] : size; >>> } >>> - if (vq->num_buffers + *nbuffers < 2) >>> - *nbuffers = 2 - vq->num_buffers; >>> - >>> *nplanes = planes; >>> - dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers); >>> + dprintk(dev, 1, "%s: count=%u\n", __func__, *nbuffers); >> >> ... but here you change it to "%u". Is there a reason for these two to be >> different? I didn't notice it in the previous version but now it stands out >> clearly. Probably you changed to %u because of the type returned by >> vb2_get_num_buffers(). And, actually, *nbuffers _is_ unsigned, too. > > Like you said *nbuffers is unsigned so %u sound for me. > The goal of this patch was to avoid vq->num_buffers usage not to clean up all the > file. > That could be done in other patch since there is lot to do here. > Arguably, if the purpose of this patch is to avoid using vq->num_buffers, the line we're discussing could be left unpatched, which minimizes the diffstat. Otherwise, you _are_ changing vid_cap_queue_setup() anyway. Regards, Andrzej > Regards, > Benjamin > >> >> Regards, >> >> Andrzej >> >>> for (p = 0; p < planes; p++) >>> dprintk(dev, 1, "%s: size[%u]=%u\n", __func__, p, sizes[p]); >>> return 0; >>
diff --git a/drivers/media/test-drivers/visl/visl-dec.c b/drivers/media/test-drivers/visl/visl-dec.c index ba20ea998d19..4672dc5e52bb 100644 --- a/drivers/media/test-drivers/visl/visl-dec.c +++ b/drivers/media/test-drivers/visl/visl-dec.c @@ -287,7 +287,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run) frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf); len = 0; - for (i = 0; i < out_q->num_buffers; i++) { + for (i = 0; i < vb2_get_num_buffers(out_q); i++) { char entry[] = "index: %u, state: %s, request_fd: %d, "; u32 old_len = len; struct vb2_buffer *vb2; @@ -347,7 +347,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run) frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf); len = 0; - for (i = 0; i < cap_q->num_buffers; i++) { + for (i = 0; i < vb2_get_num_buffers(cap_q); i++) { u32 old_len = len; struct vb2_buffer *vb2; char *q_status; diff --git a/drivers/media/test-drivers/vivid/vivid-meta-cap.c b/drivers/media/test-drivers/vivid/vivid-meta-cap.c index 780f96860a6d..0a718d037e59 100644 --- a/drivers/media/test-drivers/vivid/vivid-meta-cap.c +++ b/drivers/media/test-drivers/vivid/vivid-meta-cap.c @@ -30,9 +30,6 @@ static int meta_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, sizes[0] = size; } - if (vq->num_buffers + *nbuffers < 2) - *nbuffers = 2 - vq->num_buffers; - *nplanes = 1; return 0; } diff --git a/drivers/media/test-drivers/vivid/vivid-meta-out.c b/drivers/media/test-drivers/vivid/vivid-meta-out.c index 95835b52b58f..4a569a6e58be 100644 --- a/drivers/media/test-drivers/vivid/vivid-meta-out.c +++ b/drivers/media/test-drivers/vivid/vivid-meta-out.c @@ -18,6 +18,7 @@ static int meta_out_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, struct device *alloc_devs[]) { struct vivid_dev *dev = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); unsigned int size = sizeof(struct vivid_meta_out_buf); if (!vivid_is_webcam(dev)) @@ -30,8 +31,8 @@ static int meta_out_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, sizes[0] = size; } - if (vq->num_buffers + *nbuffers < 2) - *nbuffers = 2 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 2) + *nbuffers = 2 - q_num_bufs; *nplanes = 1; return 0; diff --git a/drivers/media/test-drivers/vivid/vivid-touch-cap.c b/drivers/media/test-drivers/vivid/vivid-touch-cap.c index c7f6e23df51e..4b3c6ea0afde 100644 --- a/drivers/media/test-drivers/vivid/vivid-touch-cap.c +++ b/drivers/media/test-drivers/vivid/vivid-touch-cap.c @@ -13,6 +13,7 @@ static int touch_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, struct device *alloc_devs[]) { struct vivid_dev *dev = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); struct v4l2_pix_format *f = &dev->tch_format; unsigned int size = f->sizeimage; @@ -23,8 +24,8 @@ static int touch_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, sizes[0] = size; } - if (vq->num_buffers + *nbuffers < 2) - *nbuffers = 2 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 2) + *nbuffers = 2 - q_num_bufs; *nplanes = 1; return 0; diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c index b65b02eeeb97..3840b3a664ac 100644 --- a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c +++ b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c @@ -134,9 +134,6 @@ static int vbi_cap_queue_setup(struct vb2_queue *vq, sizes[0] = size; - if (vq->num_buffers + *nbuffers < 2) - *nbuffers = 2 - vq->num_buffers; - *nplanes = 1; return 0; } diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-out.c b/drivers/media/test-drivers/vivid/vivid-vbi-out.c index cd56476902a2..434a10676417 100644 --- a/drivers/media/test-drivers/vivid/vivid-vbi-out.c +++ b/drivers/media/test-drivers/vivid/vivid-vbi-out.c @@ -30,9 +30,6 @@ static int vbi_out_queue_setup(struct vb2_queue *vq, sizes[0] = size; - if (vq->num_buffers + *nbuffers < 2) - *nbuffers = 2 - vq->num_buffers; - *nplanes = 1; return 0; } diff --git a/drivers/media/test-drivers/vivid/vivid-vid-cap.c b/drivers/media/test-drivers/vivid/vivid-vid-cap.c index 3a06df35a2d7..2804975fe278 100644 --- a/drivers/media/test-drivers/vivid/vivid-vid-cap.c +++ b/drivers/media/test-drivers/vivid/vivid-vid-cap.c @@ -117,9 +117,6 @@ static int vid_cap_queue_setup(struct vb2_queue *vq, dev->fmt_cap->data_offset[p]; } - if (vq->num_buffers + *nbuffers < 2) - *nbuffers = 2 - vq->num_buffers; - *nplanes = buffers; dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers); diff --git a/drivers/media/test-drivers/vivid/vivid-vid-out.c b/drivers/media/test-drivers/vivid/vivid-vid-out.c index 184a6df2c29f..1653b2988f7e 100644 --- a/drivers/media/test-drivers/vivid/vivid-vid-out.c +++ b/drivers/media/test-drivers/vivid/vivid-vid-out.c @@ -73,12 +73,9 @@ static int vid_out_queue_setup(struct vb2_queue *vq, vfmt->data_offset[p] : size; } - if (vq->num_buffers + *nbuffers < 2) - *nbuffers = 2 - vq->num_buffers; - *nplanes = planes; - dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers); + dprintk(dev, 1, "%s: count=%u\n", __func__, *nbuffers); for (p = 0; p < planes; p++) dprintk(dev, 1, "%s: size[%u]=%u\n", __func__, p, sizes[p]); return 0;