| Message ID | 20231017144756.34719-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:2908:b0:403:3b70:6f57 with SMTP id
ib8csp4189362vqb;
Tue, 17 Oct 2023 07:53:15 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IFVWtZ2cwsB1Em9i6ZEdlVCPRsQliANkkVK39cPNYP3qopaRoYLon9AThBrY8CB8Wb8vI7G
X-Received: by 2002:a05:6a00:1c92:b0:690:d0d4:6fb0 with SMTP id
y18-20020a056a001c9200b00690d0d46fb0mr2503659pfw.3.1697554395668;
Tue, 17 Oct 2023 07:53:15 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1697554395; cv=none;
d=google.com; s=arc-20160816;
b=uLocuA4EqvKxYJEg0pRUX0CJCNNbFTh08NOt7bHhaaGf/EnojpD9MGNG3NsR65XUxL
Oz3P/L0AGryjpaWbyPt2mU8tcj9xIcotoKc6QL/o7ZUvP5KuJuBxOypOEL88EiQJAOY6
w3AKO0wqZhLT7jsKz72S9Y9ihm13CkGqQ/07P+ah29UwV0J/JH1W7J0mqc0f0Ghrkz6n
CmJhpobsdrA/bVJPPn92HYmziqHHJDcTsN+O/go+2Lt4qcpUtWxz1E48umgH/YmhABvt
mbhfqyP3JOwioMHRiHzu94GZdUrMfwRxPcsY49bm4E3dmu5Fg3/a65HRE85rKDjJrpFO
2eoA==
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=5/8N2eZbHgJ2ddP4bLUKysTIn1zEaNvdYUyEuZt7upw=;
fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=;
b=XsKajqUjjJAHS1nIT+dHX4TtcfZ7QfDZGlPna71CKFpsw3pxBFPO02/EIo98tCZXEQ
mcxIslK5IcO6eZG7jt2v13QrBqKfgKakBxq/lqNVKuhsKX9gmOMjYn/JcXTcKqBIbSl8
aJLt0lePEbtv1dZrbTIxu4a1aOA+MVQdTct0ua3Z4BK2boYfHAm8fEBeHJFgZ9Y0Hvh8
/w8b3wpqqrPyKo4QWOPs2ZREoprEbPdV0+EbtXoglhX5JQpZPqZnSoIDRUCv7PvRD2nY
/3KO0t0dyTz6FlfM/McpQipRsfxWi4pmIBACPPHVXRMxIvDHNjt896dl0EG9C4yl5Ive
AjkA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=a4g5amf3;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4])
by mx.google.com with ESMTPS id
bk13-20020a056a02028d00b005855bd1ebbasi1898690pgb.204.2023.10.17.07.53.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 17 Oct 2023 07:53:15 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 as permitted sender)
client-ip=2620:137:e000::3:4;
Authentication-Results: mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=a4g5amf3;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 2177D8083AAE;
Tue, 17 Oct 2023 07:53:05 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1344566AbjJQOu6 (ORCPT <rfc822;hjfbswb@gmail.com> + 20 others);
Tue, 17 Oct 2023 10:50:58 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43744 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1344338AbjJQOse (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 17 Oct 2023 10:48:34 -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 981C21BD;
Tue, 17 Oct 2023 07:48:26 -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 695EC66073A1;
Tue, 17 Oct 2023 15:48:24 +0100 (BST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com;
s=mail; t=1697554104;
bh=8GZLJACA624oAq56RLro241MiteSnnQX+iq1uP+mVUw=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=a4g5amf3IqcMkd1LgNlsmjGOxWNOdppPYUTNsI5tgw+eidSHg5IejyW8NFBeZLaCS
o6wGiqYnnXoJJgySGgBp/lhjERCVXCJQv4ejR6YKnDG5Unc93S4psmBE1hI+FwSSkG
axcusg8C35kLc4k45KphdqhMJZkIQI8IwcGHtetj4t7ZbT453GsdFxO/uPfoYKSO0f
o0+0NcnBeFjD64co6TI0GWnJXCWTAOYsODbDcvdc6Py1beIhOn57bNbVFP5Z/nCJS8
sW4v6KTst5Fcq7D/dlK7KWODkBF7v4S850R1AvGVXWqTVz98xVMoIyBSdFITHOwUus
PnfHpIL+ff+Zg==
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 40/56] media: usb: cx231xx: Stop direct calls to queue
num_buffers field
Date: Tue, 17 Oct 2023 16:47:40 +0200
Message-Id: <20231017144756.34719-41-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=-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 howler.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 (howler.vger.email [0.0.0.0]);
Tue, 17 Oct 2023 07:53:05 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1780014798457114594
X-GMAIL-MSGID: 1780014798457114594
|
| 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/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;