From patchwork Thu Oct 19 12:51:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 155527 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp360372vqb; Thu, 19 Oct 2023 05:56:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRUXq9f04cERGhUMbkUySZ3/n2qYSP1MkwdLj9Oj89qxRmbqG7NwYvPrmU7C/yJ6OUklBW X-Received: by 2002:a17:90b:347:b0:27c:e062:c464 with SMTP id fh7-20020a17090b034700b0027ce062c464mr1974295pjb.37.1697720176787; Thu, 19 Oct 2023 05:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697720176; cv=none; d=google.com; s=arc-20160816; b=cIapY+KybcDV+yArtqsKXtk///BJJNGY1jLPYpwj19X9lpwxFTg8si8pDXg3ko/GT3 CbR4qixKNkxVW7/SDHcnJBvwjZEo9WSFpnwET2k8LI8XHikqsx3H8u/zDyDDkHr2KXbW G6nlDoYE610GrEBwUMakBqzJOCQhFD2WNoV7jCyg8R4R+YsaeD20eV5bOyFtb9f6nVhB t4mySR/FDvvrTFJd04vBDgSWq/qsR6WlB1kaZ1FmN60oUeeqzWP8kFABg9+NsqLzW5Ia dn3biicuiUcbMLIqe0ubgLxSWiNmDe2ZCQES8xR6fFohvzwySf+T14idgPSpIQOZ49qF rGEA== 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=2rHvdHyFGT8YUTP5lBNMszn2pbzYaUtIyUsvYA8bYfQ=; fh=px7ZZE7zN+iLImfXStSrbDHf67f84nNBK9ImQdNvxt4=; b=oQm+TJ14ifXbwQn6NTgS9Qpo7RS4jX1AX+DyuGXIwOnA52OIMcI8S6A9Bxo1NNcNvv iwIMtwWixSoyquM4D3TaJ+2fpqIQkHzkvAu6Q/pQKDuMnHDpxABJQslWEQIney65rwD2 2N0ADw/3fKbE6tsrdkmSJ9Osin+7MqzwYVf6wHTJaHA96ebvS+xwAFGP6yleqpmHWytY f6hugZvRlJzXeGExBT1eVeVGXWUTRl922Hllcpqk8OdtPhkGs2fTlsea68VBliatcr9a 8KpmyU9PjKHaKiY+tA9F7WlAP5lEivQoDWaB34Pal8xYn6aCcp+fjPjEPUYMoAhFvvZ3 bBMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=eIcbAZEE; 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 h1-20020a17090ac38100b00274985b2fcdsi2065751pjt.138.2023.10.19.05.56.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 05:56:16 -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=eIcbAZEE; 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 073EC8232667; Thu, 19 Oct 2023 05:56:06 -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 S1345904AbjJSMyR (ORCPT + 25 others); Thu, 19 Oct 2023 08:54:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345822AbjJSMwr (ORCPT ); Thu, 19 Oct 2023 08:52:47 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 720F719F; Thu, 19 Oct 2023 05:52:45 -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 A87896607369; Thu, 19 Oct 2023 13:52:43 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697719964; bh=ABio7Fn7k/+8wlqN/VSwa9bzp38ffNKUWzBFOmL8pwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eIcbAZEEyREsB/G8CujddavZeznK/65VXH6yM5u8eZGWBVW2qiiwbprBcu5YvxOhq lGBFC/hFq4ufPkEsOgR47R9WL+iKwFF+2kglqEYdMLUnRucTuNrO3znrUCq0LvtQJo 3+oxn6UX2nGpsZkxr2D34lq+BrBEGD9mOjaniK12flQIqrDPD7xApRJ+yKbMbM+HDC wlbJ7FdnngQsbFkwYpq560G2NsT5LdNukd2I5FqI0iRVB5sGZMbqS/NAG1gFCFopsc 48vBxCYdLC3Tsvzna0yg6cCIfYKWF1ybCv/uskTQ983scM0csm/iIETeoPodgAlx5M v6UKMjMsrHzaQ== 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 , Fabrizio Castro Subject: [PATCH v13 25/56] media: pci: tw68: Stop direct calls to queue num_buffers field Date: Thu, 19 Oct 2023 14:51:51 +0200 Message-Id: <20231019125222.21370-26-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 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: 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:56:06 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780188632165647138 X-GMAIL-MSGID: 1780188632165647138 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 CC: Fabrizio Castro --- drivers/media/pci/tw68/tw68-video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/tw68/tw68-video.c b/drivers/media/pci/tw68/tw68-video.c index 773a18702d36..35296c226019 100644 --- a/drivers/media/pci/tw68/tw68-video.c +++ b/drivers/media/pci/tw68/tw68-video.c @@ -360,13 +360,13 @@ static int tw68_queue_setup(struct vb2_queue *q, unsigned int sizes[], struct device *alloc_devs[]) { struct tw68_dev *dev = vb2_get_drv_priv(q); - unsigned tot_bufs = q->num_buffers + *num_buffers; + unsigned tot_bufs = vb2_get_num_buffers(q) + *num_buffers; unsigned size = (dev->fmt->depth * dev->width * dev->height) >> 3; if (tot_bufs < 2) tot_bufs = 2; tot_bufs = tw68_buffer_count(size, tot_bufs); - *num_buffers = tot_bufs - q->num_buffers; + *num_buffers = tot_bufs - vb2_get_num_buffers(q); /* * We allow create_bufs, but only if the sizeimage is >= as the * current sizeimage. The tw68_buffer_count calculation becomes quite