| Message ID | 20231019125222.21370-41-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:2010:b0:403:3b70:6f57 with SMTP id
fe16csp361499vqb;
Thu, 19 Oct 2023 05:58:28 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IGThOtmhFRLh72G4HIAunPiabq7p/CH/WXxa6cg0uZZ4Yw7N078nN/eD73Vq+vsqmCK4GFK
X-Received: by 2002:a05:6830:18ca:b0:6bd:ba2c:fbbd with SMTP id
v10-20020a05683018ca00b006bdba2cfbbdmr2528404ote.20.1697720308486;
Thu, 19 Oct 2023 05:58:28 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1697720308; cv=none;
d=google.com; s=arc-20160816;
b=GpCk14B7Kmdpah1PlxGEZKANEOdksnKQrcX+Ch4nJTis4iS+txuBs4ZEe5sY40ibj4
uT+P5m3jb4ep5DsUo+ewkyesRvZyBxxxhFoShomfIWpwM+Kw6eXMEugBKx2zMrCa4f/2
cAMvFKASzQDaFww39yWOXH5uL4tj1hmeu6OBOZyHTjL4hAD0T4eVtyZ5zAjfNft4Y5JQ
eWdAbdxvwxLjRckttRmFZUQC3TBK5kIPfBailm601Ue1eX+qmH6+B7nXdkbjnsj5OEtt
SwmznNuo5ivI3TJ7/MnAGZcxOOwela9RTXCp39cp232zwBzVCOxM7kbNlTln9LitW444
MRow==
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=7TzFIwouZEcivlJJKig6vtNF+AeLrIsSqmaihWMI0/Y=;
fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=;
b=oM2D5v39q4B7tUzJUHrb4hNgMhdkz1bssHxxlVim7YiuAvce1fOpJInDB6NUbrTCBR
WUf7p075FlaOXpRuCQHVtTn1JF5vyb+sdzIrlTVUeijuxxjfb6c7ZvkiLePYbvdPcN72
2iXZRgeXAzV9g1ifXeUR33ySG/rn4ZUrcb1laSE4l2c7inNxFR0Em29Yn85CJkwQ0oyN
gnJs+dXgY4AbhjIm0b24wbNsY+jlOpzR+ia6Q3BWNfZMUXhIwfufjtgiw5B3/rErEkuP
MHDO7HU8OGHRnx7dKeqZFaMXOwxV2f8dM/kN6Q99DuueToAOoorJAMBRM1pwhGmNCEhI
/zxQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=WgFF4qP6;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5])
by mx.google.com with ESMTPS id
u14-20020a056a00158e00b006be322191e1si6582514pfk.254.2023.10.19.05.58.28
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 19 Oct 2023 05:58:28 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:5 as permitted sender)
client-ip=2620:137:e000::3:5;
Authentication-Results: mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=WgFF4qP6;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id EA9FD8229F38;
Thu, 19 Oct 2023 05:58:13 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1345977AbjJSMzy (ORCPT <rfc822;lkml4gm@gmail.com> + 25 others);
Thu, 19 Oct 2023 08:55:54 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59118 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1346008AbjJSMxw (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 19 Oct 2023 08:53:52 -0400
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 4B82410C3;
Thu, 19 Oct 2023 05:52:56 -0700 (PDT)
Received: from benjamin-XPS-13-9310.. (unknown
[IPv6:2a01:e0a:120:3210:ccea:1fb5:34eb:239b])
(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 79C176607383;
Thu, 19 Oct 2023 13:52:51 +0100 (BST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com;
s=mail; t=1697719971;
bh=ctJwIFCoy8onwGJKVxQ8/AgSsQL3q8AbAm0x7jyK8jw=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=WgFF4qP6A1m1kW1mP90ZYzARSYhFCfcujQeYQFu7kypYHKTsoy08F7Bxud5fkvgcP
X9VJkpyYHrMvH0pHNsF1Pv5wixUw3e5QK8T6qLZ1ME1Oa2lvAkHTGqgEnpTFEspAsj
FhaKKeGrDFVq1YPbyEtGKJm99Yf0/TpVBbWez9oqWxMqmCVB89GPndujnT6DVymkNE
ZNn3jGhLtrS7r6PIjka19CUqeuI906YZBE/UzB+fvK9Ab+vokgv1W0+mWmRf7y43CN
5VQK09wEvEi/J+sm4a0W+EOCqzmWkJrD2An+V0x9uQLykETwZBtFG6AHAuyRdf49UM
Vn9wZlA68NXTQ==
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 v13 40/56] media: usb: cx231xx: Stop direct calls to queue
num_buffers field
Date: Thu, 19 Oct 2023 14:52:06 +0200
Message-Id: <20231019125222.21370-41-benjamin.gaignard@collabora.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20231019125222.21370-1-benjamin.gaignard@collabora.com>
References: <20231019125222.21370-1-benjamin.gaignard@collabora.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
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 (groat.vger.email [0.0.0.0]);
Thu, 19 Oct 2023 05:58:14 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1780188769931746460
X-GMAIL-MSGID: 1780188769931746460
|
| Series |
Add DELETE_BUF ioctl
|
|
Commit Message
Benjamin Gaignard
Oct. 19, 2023, 12:52 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.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
---
drivers/media/usb/cx231xx/cx231xx-417.c | 5 +++--
drivers/media/usb/cx231xx/cx231xx-video.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c index fe4410a5e128..45973fe690b2 100644 --- a/drivers/media/usb/cx231xx/cx231xx-417.c +++ b/drivers/media/usb/cx231xx/cx231xx-417.c @@ -1218,12 +1218,13 @@ static int queue_setup(struct vb2_queue *vq, { struct cx231xx *dev = vb2_get_drv_priv(vq); unsigned int size = mpeglinesize * mpeglines; + unsigned int q_num_bufs = vb2_get_num_buffers(vq); dev->ts1.ts_packet_size = mpeglinesize; dev->ts1.ts_packet_count = mpeglines; - if (vq->num_buffers + *nbuffers < CX231XX_MIN_BUF) - *nbuffers = CX231XX_MIN_BUF - vq->num_buffers; + if (q_num_bufs + *nbuffers < CX231XX_MIN_BUF) + *nbuffers = CX231XX_MIN_BUF - q_num_bufs; if (*nplanes) return sizes[0] < size ? -EINVAL : 0; diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c index e23b8ccd79d4..c8eb4222319d 100644 --- a/drivers/media/usb/cx231xx/cx231xx-video.c +++ b/drivers/media/usb/cx231xx/cx231xx-video.c @@ -714,11 +714,12 @@ static int queue_setup(struct vb2_queue *vq, unsigned int sizes[], struct device *alloc_devs[]) { struct cx231xx *dev = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); dev->size = (dev->width * dev->height * dev->format->depth + 7) >> 3; - if (vq->num_buffers + *nbuffers < CX231XX_MIN_BUF) - *nbuffers = CX231XX_MIN_BUF - vq->num_buffers; + if (q_num_bufs + *nbuffers < CX231XX_MIN_BUF) + *nbuffers = CX231XX_MIN_BUF - q_num_bufs; if (*nplanes) return sizes[0] < dev->size ? -EINVAL : 0;