| Message ID | 20230914133323.198857-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:172:b0:3f2:4152:657d with SMTP id h50csp804226vqi;
Thu, 14 Sep 2023 21:45:23 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IEMjikuWbf+IKQqaZu4kkcKQYU/0RUJ47ULyi6sUvtQF9TEGhk/lN08jYeAvaqtTtgos0sU
X-Received: by 2002:a05:6359:588:b0:142:d3dc:d3f3 with SMTP id
ee8-20020a056359058800b00142d3dcd3f3mr710186rwb.0.1694753122923;
Thu, 14 Sep 2023 21:45:22 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1694753122; cv=none;
d=google.com; s=arc-20160816;
b=QFwijrKDK+YqT30v6lulk5zxJZDtTRZUpQ0J1WDF0QwUGf9qlVRbm4dZlLwTpQgWq7
48OW/yOOUvM6gjbHJjYaC/k0VUzws14ON+4MuiBNKVXmkfBgQSjmQABvlw2T0SICG8CP
GSBQqmpmcwo+gHDKXJOfB6jT952+NAjbOJHtb6k6K7RX6bRLrnSL2mOZGix/6TJSmD8J
6K+L903sE32c7uYP9uc/pbZb/b4I9ddWT7exrC8vTHFPaX6wVtrLgIhw+qVAusry7R/p
uULhWt1Lz4bxweS4Xk6cOKx/NCV9CHhj3XOaZqC58RG/dfh1bCjscwxhveovfOhYVeg8
07FQ==
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=WfkYHk/trVkAjRfanFzeHGLwCwhCkoy3XYc/vqt+hgI=;
fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=;
b=ZSP3i/BeiNSUvVEObs9p6gnaiS++iJTGGSbhfp6kq51dC0rwzoZdBWvoz/Mrtpy5E4
uYBx2+s0+u0OcZqiklZV4wHdoq3o8t9xEvcCJ0Jm8zYstvT0syt0gTQtrRChNiJNfdP3
jpSJKmXb0hsFPiBkeOXWACmfZDEgUfN+hAm8rE9VMqh325W/lA3/8H47FM52p89G1YT0
Mt/rWg4m4xUr/AW2esGjlbW4SCClNJdtugLMWAXTGtlRmZjZWVoifjWaZQhRCuoY3d5a
DzuozIe1JDKgW3dkv95E+ZZ/o9abJoHitciX3s7ASavjJlXd6DdRRuTBc9bwiL2ri5/g
q8Fg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@collabora.com header.s=mail header.b=FtrDiCcT;
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
e5-20020a656785000000b0057766b996f7si2568633pgr.824.2023.09.14.21.45.22
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 14 Sep 2023 21:45:22 -0700 (PDT)
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=FtrDiCcT;
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 B137D82F4090;
Thu, 14 Sep 2023 06:35:37 -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 S240000AbjINNf2 (ORCPT <rfc822;chrisfriedt@gmail.com>
+ 35 others); Thu, 14 Sep 2023 09:35:28 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54346 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S239412AbjINNes (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 14 Sep 2023 09:34:48 -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 1A5C32713;
Thu, 14 Sep 2023 06:33:53 -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 84CF3660738F;
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=jspqya66/sOJC0Q2CfHFiQMFqhK2LjIJM71tuArTZQs=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=FtrDiCcTc86G8WNqSS69XZsMirB/zhQO0FMh1ndMQqet0ySMzvbnp6ZMe9LwCMmjC
rsCNvhVjgbWEaH9oFqRRpfRtLJr9qsGMZUsKFtGLzMnDO7R7morG2c4e67lznT+lmr
zhZ/EvgX3pDFC0ZsZ6MfebySFZNPp6YlHWQY0CZu+8K0v0M3L8GTnWLtjkzRRq4/P/
WqeBftrKoHcqEJ5G9JvmfgBtzISw9SVEOjnnlkmVRM+fVyx4XQMNHVNHL+52nZtpDz
6W/miDgFF3JRzviElCG6KYvy4nerjl4SVMzkNWBcl5Grj4BfC08OMselt208df+7Nv
mn+7+f4l/k6lQ==
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 39/49] media: usb: hackrf: Stop direct calls to queue
num_buffers field
Date: Thu, 14 Sep 2023 15:33:13 +0200
Message-Id: <20230914133323.198857-40-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 (snail.vger.email [0.0.0.0]);
Thu, 14 Sep 2023 06:35:37 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1777077450825348198
X-GMAIL-MSGID: 1777077450825348198
|
| 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/hackrf/hackrf.c | 5 +++--
1 file changed, 3 insertions(+), 2 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/hackrf/hackrf.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c > index 3e535be2c520..9c0ecd5f056c 100644 > --- a/drivers/media/usb/hackrf/hackrf.c > +++ b/drivers/media/usb/hackrf/hackrf.c > @@ -753,12 +753,13 @@ static int hackrf_queue_setup(struct vb2_queue *vq, > unsigned int *nplanes, unsigned int sizes[], struct device *alloc_devs[]) > { > struct hackrf_dev *dev = vb2_get_drv_priv(vq); > + unsigned int q_num_bufs = vb2_get_num_buffers(vq); > > dev_dbg(dev->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; Drop check, set min_buffers_needed to 8. Regards, Hans > *nplanes = 1; > sizes[0] = PAGE_ALIGN(dev->buffersize); >
diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c index 3e535be2c520..9c0ecd5f056c 100644 --- a/drivers/media/usb/hackrf/hackrf.c +++ b/drivers/media/usb/hackrf/hackrf.c @@ -753,12 +753,13 @@ static int hackrf_queue_setup(struct vb2_queue *vq, unsigned int *nplanes, unsigned int sizes[], struct device *alloc_devs[]) { struct hackrf_dev *dev = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); dev_dbg(dev->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(dev->buffersize);