| Message ID | 20231017144756.34719-40-benjamin.gaignard@collabora.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id
ib8csp4188821vqb;
Tue, 17 Oct 2023 07:52:19 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IF7rAoCW/dysLcAVSPcuRHOycWE1Da3v+C6DOQB9lseuahfI2XB+LkknLXnWPrVa3XOUY+f
X-Received: by 2002:a17:902:d04c:b0:1b8:2ba0:c9a8 with SMTP id
l12-20020a170902d04c00b001b82ba0c9a8mr2478796pll.2.1697554339629;
Tue, 17 Oct 2023 07:52:19 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1697554339; cv=none;
d=google.com; s=arc-20160816;
b=PBIcOwMI1zNh1ygAovFBmmp/t2lkuH2vWjqBNSTDRSftpgYGpfIT7szKq7FB47t2NH
c7sTcz8YGxuPhpSvQ6/oK5JKxgYqsG0jrtQLSqDbJq82tpRyA1unCIt67u4cABR5Tv8A
Ely7hwlU3bewz5VuOnRaevwsqAp+dvBxC2QKNnNCuIICVsHZA9cG9csrswdKF1X5lZ1P
j035/oqAWxK4zdrp8XgHqAtWqqTeXmN4laF95oE1p9pY47xPFoaIh05Cz6znx5h9yFJc
lrsTUkOnCtuRJxNd7JNCdxkO/s39U76/w9LcWQcHwZ1SjAvNs08/Adsd50UpwUII6xQQ
vviQ==
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=fVdBi80fJ4g+opCYHZnOPt8ZGBYw+nciJvr68ZP2UOA=;
fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=;
b=k2Xd6tJQIthmTsVFlsMlcRBJ4DnFFHcUw8oQzt2L5Xl/7DgV3u/erLvDW3H46YUL/q
uz8w+7C0lVvIG85sVH+Q6+xzwLVYfFM3mGv4sR7rzbgI+Na87ZYbU6Whg9x1zLkjOzpY
zJCXceYaWP/KPiNibgJ3f7T3xjRfTdY4cZCEAhtLkThZk+OBiKqHpehN3bqtotTE9dfn
FiRZT1YsGJBNKe2wqQzAEbMGGpEG6sdOC146Ps2kF0x7icrkPWaDg1HkSARZ9ol3SQ1O
htBMRjx8R4+vue1IM968okWyzIJrqpedQYT+aTjuFvDzlPhcCTcLKBQwYnYam/GuOS1W
WcYw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=mo9WhV0B;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 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. [23.128.96.37])
by mx.google.com with ESMTPS id
p1-20020a170902c70100b001c4621ac000si1773534plp.246.2023.10.17.07.52.19
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 17 Oct 2023 07:52:19 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Authentication-Results: mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=mo9WhV0B;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 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 E3E92807757B;
Tue, 17 Oct 2023 07:51:23 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1344626AbjJQOuw (ORCPT <rfc822;hjfbswb@gmail.com> + 20 others);
Tue, 17 Oct 2023 10:50:52 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43978 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1344325AbjJQOsd (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 17 Oct 2023 10:48:33 -0400
Received: from madras.collabora.co.uk (madras.collabora.co.uk
[46.235.227.172])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F36A91BB;
Tue, 17 Oct 2023 07:48:25 -0700 (PDT)
Received: from benjamin-XPS-13-9310.. (unknown
[IPv6:2a01:e0a:120:3210:7205:da49:a7e8:59f8])
(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 DE906660736A;
Tue, 17 Oct 2023 15:48:23 +0100 (BST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com;
s=mail; t=1697554104;
bh=EmDlcksu9sAQe9FqbVjRgYMb2Lj2aSXClH/X/fW3THQ=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=mo9WhV0BDyXqlFfAo0GYjOr9+ZUXjRPS8Lbg36ii3eELJhJbgKSQ3UpCjyiu7BKRm
FKUOxzY0Agl1F6/+uaUu7WXMJHztDCAFUjY49don+4wqnP2jplWpAMFa5IHDNXlxj+
kmRN0R8TcGvQWWU5DvHPSJ8aSRQwiL4xDDUN7PN9SW4zymK9NFhF8RcdO2AaKoVUOR
oiKv1Pmh2DlqqzMSLbRBkNrFjy1ySQGOCr5GXQFXHgvbO+qqb+snlGWhKOnSMJmKPb
5BfzmTyAJHCqpA+BljnVI50xlMI1t5JNCXktghKU3DmNvuay81MmBOxvnydirYRjgS
ohBv18ydiAGfQ==
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>
Subject: [PATCH v12 39/56] media: usb: Stop direct calls to queue num_buffers
field
Date: Tue, 17 Oct 2023 16:47:39 +0200
Message-Id: <20231017144756.34719-40-benjamin.gaignard@collabora.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20231017144756.34719-1-benjamin.gaignard@collabora.com>
References: <20231017144756.34719-1-benjamin.gaignard@collabora.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS
autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
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]);
Tue, 17 Oct 2023 07:51:23 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1780014739314978980
X-GMAIL-MSGID: 1780014739314978980
|
| Series |
Add DELETE_BUF ioctl
|
|
Commit Message
Benjamin Gaignard
Oct. 17, 2023, 2:47 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
futur.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
---
drivers/media/usb/airspy/airspy.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Comments
Subject line doesn't mention 'airspy:' Regards, Hans On 17/10/2023 16:47, Benjamin Gaignard wrote: > 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 > futur. > > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> > --- > drivers/media/usb/airspy/airspy.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c > index 462eb8423506..e24e655fb1db 100644 > --- a/drivers/media/usb/airspy/airspy.c > +++ b/drivers/media/usb/airspy/airspy.c > @@ -482,12 +482,13 @@ static int airspy_queue_setup(struct vb2_queue *vq, > unsigned int *nplanes, unsigned int sizes[], struct device *alloc_devs[]) > { > struct airspy *s = vb2_get_drv_priv(vq); > + unsigned int q_num_bufs = vb2_get_num_buffers(vq); > > dev_dbg(s->dev, "nbuffers=%d\n", *nbuffers); > > /* Need at least 8 buffers */ > - if (vq->num_buffers + *nbuffers < 8) > - *nbuffers = 8 - vq->num_buffers; > + if (q_num_bufs + *nbuffers < 8) > + *nbuffers = 8 - q_num_bufs; > *nplanes = 1; > sizes[0] = PAGE_ALIGN(s->buffersize); >
diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c index 462eb8423506..e24e655fb1db 100644 --- a/drivers/media/usb/airspy/airspy.c +++ b/drivers/media/usb/airspy/airspy.c @@ -482,12 +482,13 @@ static int airspy_queue_setup(struct vb2_queue *vq, unsigned int *nplanes, unsigned int sizes[], struct device *alloc_devs[]) { struct airspy *s = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); dev_dbg(s->dev, "nbuffers=%d\n", *nbuffers); /* Need at least 8 buffers */ - if (vq->num_buffers + *nbuffers < 8) - *nbuffers = 8 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 8) + *nbuffers = 8 - q_num_bufs; *nplanes = 1; sizes[0] = PAGE_ALIGN(s->buffersize);