| Message ID | 20230914133323.198857-39-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:172:b0:3f2:4152:657d with SMTP id h50csp515649vqi;
Thu, 14 Sep 2023 10:41:42 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IEU1HP+C8W29lEeBik3KoTbS9HbKMbLrEwUmlErfU9tguyyb/OZ2qjRYZq57tNUZYmxTCU2
X-Received: by 2002:a17:90a:1283:b0:268:38a7:842e with SMTP id
g3-20020a17090a128300b0026838a7842emr5555758pja.2.1694713301886;
Thu, 14 Sep 2023 10:41:41 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1694713301; cv=none;
d=google.com; s=arc-20160816;
b=j/PNZyhyW4kBI2xbrfpV+5yNVc0cJhVtOnz95dnI4HL8lZFgDB4fHExmYa04ipL5td
jbm4HI+/erTexnRD7sbXk/SchNVjEkLSGrxXUjUxjFX8E454TK7FSv37WqYfAMC7bB6c
HGhqSDTHbsZYNjXyM4Ux5Z4kG3hP7x4o9rTaa17o4DyODh3Tsg/EhXzLIHLlldX38LOV
CZ43e/bb7W5N+QATXSBpgcpJ/fjE6xC15wf7w4zYEI1XtFT+eKCRyK9AQF9AlQTQvzAn
ua8vH4Xo8tURtSdFPLmFGkqVfZl/qJ8HGVdfInVEGoPX/8KihGPcl3VYx2I/ScnIU1//
RkKA==
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=ZAqRgpKDVDV3j3Lx0EUgt4DwJaMvzdnnmZd2h1bN62c=;
fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=;
b=AaNb2aUeoLzSRTflnqGt9X8Qfg9LeoEM5GHapmbwJfo2O4IR0x7U2f06o72B6mDYgi
oTT6m1EheYLaz3KznNp6oeXqBe9wE8Fc/nPxipKFtYF6NAauRq1zHXOHDNz95fL5Mnng
vnloGhcbj4ztvIn/SiXwfnajsi9ZqSpRmoy0VFSizbPXO7KAxwOSJ4q529e/YG2KfEUp
ld4kawRaYjXcMyR569BzgJMqS7M6wLk6ZwlTp47oQk/d17c859Fru3YxmHLyqn2fus9H
worDcqMy+o2SVIZ4PEUV8NKP1Lhrlg5fdhM9EYdV9wDi40gBkcjScTi+enD42EtdsWV7
YU0A==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=CGtACEWk;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1])
by mx.google.com with ESMTPS id
b2-20020a17090a6ac200b0027359ccdfeasi4058531pjm.122.2023.09.14.10.41.40
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 14 Sep 2023 10:41:41 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:1 as permitted sender)
client-ip=2620:137:e000::3:1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=CGtACEWk;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id 9775E826E69B;
Thu, 14 Sep 2023 06:36:35 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S239623AbjINNfS (ORCPT <rfc822;chrisfriedt@gmail.com>
+ 35 others); Thu, 14 Sep 2023 09:35:18 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49448 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S239724AbjINNem (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 14 Sep 2023 09:34:42 -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 C40272707;
Thu, 14 Sep 2023 06:33:52 -0700 (PDT)
Received: from benjamin-XPS-13-9310.. (unknown
[IPv6:2a01:e0a:120:3210:36f2:37bd:ccbb:373f])
(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 04702660737C;
Thu, 14 Sep 2023 14:33:51 +0100 (BST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com;
s=mail; t=1694698431;
bh=B011NIBIJAGyFwZSTyw+k80RuXUocSH7ODG0b+1sZBU=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=CGtACEWkKQesYSAvkU0BWg6izVBOghL10PsjDrmnT4bDx02gde3v5hddxApJoyq32
7G8nHpvClGZ+VNVUN9eVKGJo6xFkU88LpJI4XEcXXLTc3rKb5zhZQQtbZNb0UcMwax
X7VrZFyfglSFeKhixLrtjSQJT7ECGOiY/dyjfjkWPf568Jq67boXyCCvGbx3lbMRt8
8YN2yTLj2AmwOiPi9Yp1KqRPoXfFZDeB2yPxMuHFioVcrml+Sgx4XPCtaHe0Vgpf/z
Ut3l7gKG7BiA6mArC8WFrgjNaW5cvOpnxhJPcHYYNYeGsE7Ve4tDHgQRyOktWeGIjW
skYKe4axRbNFA==
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 v7 38/49] media: usb: cx231xx: Stop direct calls to queue
num_buffers field
Date: Thu, 14 Sep 2023 15:33:12 +0200
Message-Id: <20230914133323.198857-39-benjamin.gaignard@collabora.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230914133323.198857-1-benjamin.gaignard@collabora.com>
References: <20230914133323.198857-1-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 (morse.vger.email [0.0.0.0]);
Thu, 14 Sep 2023 06:36:35 -0700 (PDT)
X-Spam-Status: No, score=-0.9 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 morse.vger.email
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1777035695023777406
X-GMAIL-MSGID: 1777035695023777406
|
| Series |
Add DELETE_BUF ioctl
|
|
Commit Message
Benjamin Gaignard
Sept. 14, 2023, 1:33 p.m. UTC
Use vb2_get_num_buffers() to avoid using queue num_buffer field directly.
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(-)
Comments
On 14/09/2023 15:33, Benjamin Gaignard wrote: > Use vb2_get_num_buffers() to avoid using queue num_buffer field directly. > > 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 c5e21785fafe..9ec0b7e355e2 100644 > --- a/drivers/media/usb/cx231xx/cx231xx-417.c > +++ b/drivers/media/usb/cx231xx/cx231xx-417.c > @@ -1218,13 +1218,14 @@ 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); > unsigned int size = mpeglinesize * mpeglines; > > 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; Drop the check, update min_buffers_needed from 1 to CX231XX_MIN_BUF. > > 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; Ditto. > > if (*nplanes) > return sizes[0] < dev->size ? -EINVAL : 0; Regards, Hans
diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c index c5e21785fafe..9ec0b7e355e2 100644 --- a/drivers/media/usb/cx231xx/cx231xx-417.c +++ b/drivers/media/usb/cx231xx/cx231xx-417.c @@ -1218,13 +1218,14 @@ 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); unsigned int size = mpeglinesize * mpeglines; 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;