Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp3212260rdg; Tue, 17 Oct 2023 07:52:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHiMra9LT204AjFMmH/As2cBOAdkMkSeZ4vK/++KfSPjB46DFdMW2ZuoKj8a5MnzVnMZUqC X-Received: by 2002:a05:6830:1282:b0:6bd:bcd:43f8 with SMTP id z2-20020a056830128200b006bd0bcd43f8mr2489403otp.21.1697554340750; Tue, 17 Oct 2023 07:52:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697554340; cv=none; d=google.com; s=arc-20160816; b=iljBQOsa7YCQOrZYDZDuS3kbjJdMcKXWcWEsOfzW0+9sD63dcL0c1i+qN2GkCDNYL3 MQRwATjztN44kTJG/dvR/RkkyrMUSru0xcizjYJcC2UqqGmLWUZlaiVgqPBh9mSt9mt0 yoODBIEKQM2igX4EwUrHDjfyjg7iyoyNYikUdUUrRCmA2HGDVaeJZiqLBnzMS2w2uPLv ECiKBpDtvfO+VCJNSh7I7LJBvotZfKKGm51yAxe7WJuiEBbK8J2ugYGSQxlh1ti97oZx wDNVUu0IvDcTUcBtnGRCpGl1UXA5mXnK4t2WRupfZZPLNdgIIJzcwD7xqeil72LsNAXK WWUA== 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=E8fzbqnpuSF7llz2zrte1gqg+9Jjpmp6wngpYmwriA0=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=FQY35L/onAL6Uc+oFj20+cpOkidE/QluXbHU/ztFcA8Uut80eTWgbq0IDQxVPX4HcE n56avl+DOq7aiGiA3a/bhRq82VgdYDZaWtn3xcbLMLnCjgmxOwhq+X8hdHlC9oYjBHKR Q+KTDccFAUev1jGzXqKf94xhlQgGmnh9Ud1M4avwIorLY37ci2ABi4Tbn/Jnb++kwERD iJ3HmD1XHOujl90n4wH5t9+yl2XTYl8ub1ZPJC7M8ZSOp2TRjwR6eP8WkceywcWCnCeD d83AJUDo0JhpNkW83PIpue7x95Ukwkqj2IO2tHqRkKyDrTZ3Wkega5YAb7b8TO3WhOI7 7E4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=nI9BoGaA; 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 Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id h7-20020a636c07000000b005acb88d8c15si1962883pgc.386.2023.10.17.07.52.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:52:20 -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=nI9BoGaA; 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 CA48F8043904; Tue, 17 Oct 2023 07:51:34 -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 S1344635AbjJQOvE (ORCPT + 99 others); Tue, 17 Oct 2023 10:51:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344267AbjJQOsf (ORCPT ); Tue, 17 Oct 2023 10:48:35 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF4B4113; Tue, 17 Oct 2023 07:48:27 -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 73F8B66073A6; Tue, 17 Oct 2023 15:48:25 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697554105; bh=R5HfsLcfPw3e1xcp8H3MPpbUdOMLjhRWrPhiuKICT0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nI9BoGaAJlHIdmWnVuOucMI0jMXM6fn5Vu6yoGz9KOlJfleQ6/xBuztSrO1C/2k+Q yNw7xlQt/7bijzfzCLXvu+GiEzxQZ87Caf3GThCTikIE8wo6jfMMi8ns5/UpUTygS1 Rjo5rP/w6h1EkoR1nLQY5D5l/Jf45gUgaK+s8dlrU7Sl1G1KEyu1yS5pF0RjNr1djH G6rbleHyw1606urpdZG23neHaDhAkBJyC02hH6nlaWa9uIqxLzarRwbd32xZojgDUv Wm2KvZ1hKXOW9vPVWjW7apOtCKyV3350kbA4e5mxO4L+2ZfdclPL4NofLNJgAilUIU iHHzteoT/r20w== From: Benjamin Gaignard 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 Subject: [PATCH v12 42/56] media: usb: usbtv: Stop direct calls to queue num_buffers field Date: Tue, 17 Oct 2023 16:47:42 +0200 Message-Id: <20231017144756.34719-43-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: 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:35 -0700 (PDT) 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 --- drivers/media/usb/usbtv/usbtv-video.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c index 1e30e05953dc..62a583040cd4 100644 --- a/drivers/media/usb/usbtv/usbtv-video.c +++ b/drivers/media/usb/usbtv/usbtv-video.c @@ -726,9 +726,10 @@ static int usbtv_queue_setup(struct vb2_queue *vq, { struct usbtv *usbtv = vb2_get_drv_priv(vq); unsigned size = USBTV_CHUNK * usbtv->n_chunks * 2 * sizeof(u32); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); - if (vq->num_buffers + *nbuffers < 2) - *nbuffers = 2 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 2) + *nbuffers = 2 - q_num_bufs; if (*nplanes) return sizes[0] < size ? -EINVAL : 0; *nplanes = 1; -- 2.39.2