From patchwork Tue Oct 17 14:47:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 154349 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4189131vqb; Tue, 17 Oct 2023 07:52:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEBdUvW06aDqiIenEZnkDliOQ17rdgZ7RFe8Fr0C81ooGsdlOE++UErcTYIGy1xso2qdnQ/ X-Received: by 2002:a05:6a20:7fa9:b0:171:737:dfaf with SMTP id d41-20020a056a207fa900b001710737dfafmr2892158pzj.5.1697554370349; Tue, 17 Oct 2023 07:52:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697554370; cv=none; d=google.com; s=arc-20160816; b=ZFplvIOwOwdSN0mE8WmSL5chfDrhbbnKbgy23U2ApHnbjC9hl33X4h+XGSftg5DuKI m2w+ilyDLhou04+thJf8c4DSlf12P2PVBzM6p4lQnqapRxYhM9eTkp6Td6HO6wHK4RAn eHwqlQTHBj3tTNmE6iIkARSgmNXc8QcShZx88WenfpDJBhf5qq+oO3VfimkfNKuIzUAC EGJ1+qcQq8iFgDn98xTqUDchTRvVaVTVqLf5TNDJ9n9yU/ZA2pmSb9LgdvVcFry2ZbRR 7WDQEVqlP/qXRdjdoyyZWyE1AOqayUISBRTE2G3Py88m0I5CI9srqPJ19lEFUSEln45W zjcA== 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=T87t/s64H9A0cr1T8d1+Emo3XLIhBi9sxh0yHUCw2C0=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=uaQOinjDIOAfhVEwjLcjn0N0O/J1HqdyP7SiaFuQ+21KzULqVjgcYkHQ1fVbWKG7o5 yU5LIcZ/xkjnbv2pB4nkyP+ReVozjd4HPtuCjhhfhfXIqgWDY2JzDWGI/6GbME2TRgHf IiqPmKpIFl/dmZc8WwYSidtWm85CK3GSJXNn5Twvrb3OZx8AmlxDD4dzq6cQ6pNi2Z/S aCop0Psk0sOyh3URAFIJ1g4CYdBzkzc3vAOejF9ovdLTj2vQqoZ3rPYNV5DETv8R6h5/ TN3adGvIEkat8U3LKusglglT8q3Uolg4yZEDwRDY7ylBmZgMxmuWPMVxYd5XPvHgdQUn qvYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BCx+zH6n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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. [23.128.96.31]) by mx.google.com with ESMTPS id n11-20020a1709026a8b00b001c724f99800si1827809plk.44.2023.10.17.07.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:52:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BCx+zH6n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 8CE53807C85D; Tue, 17 Oct 2023 07:50:33 -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 S1344446AbjJQOuG (ORCPT + 20 others); Tue, 17 Oct 2023 10:50:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344288AbjJQOs3 (ORCPT ); Tue, 17 Oct 2023 10:48:29 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39FD519E; Tue, 17 Oct 2023 07:48:23 -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 3CBB06607391; Tue, 17 Oct 2023 15:48:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697554101; bh=cNX0Uc/focM3lrX3oS9L9Q1ymhjMXLItiK8qS21I4NE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BCx+zH6n0Y75JloFAelQE+A6IWUdf52gtEuL3Lj8VXzDeSyU1BVmR7tpgPt+RgGC6 oQ/xrN6we7eq49q6nSXC7MK4GUrsU1zV3eWIl8a9yzmB+1wtKOSCONjY7CVZcwsnDo BWfP/mb9mtUodjN1AMPQ9sFKpM6fVSMXGZhl160mDI9R/qNe/toFbDQDxgcJxo33hF nkRhLnp/fQyT2JQ7VmGZMXEh9UVfOuF7npz6IlMXAu2JcyCW25LhM/DwR+2+7S6Og3 ZLhZOctgTEgWl1+xGDCsl1uRiD7OpjZpyhMi62WnO32Xow4ZdQPD9SrGisS8IVq1jA uZa2rToIp6VXQ== 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 34/56] sample: v4l: Stop direct calls to queue num_buffers field Date: Tue, 17 Oct 2023 16:47:34 +0200 Message-Id: <20231017144756.34719-35-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 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 morse.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 (morse.vger.email [0.0.0.0]); Tue, 17 Oct 2023 07:50:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780014771462250955 X-GMAIL-MSGID: 1780014771462250955 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 --- samples/v4l/v4l2-pci-skeleton.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/samples/v4l/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleton.c index a61f94db18d9..a65aa9d1e9da 100644 --- a/samples/v4l/v4l2-pci-skeleton.c +++ b/samples/v4l/v4l2-pci-skeleton.c @@ -155,6 +155,7 @@ static int queue_setup(struct vb2_queue *vq, unsigned int sizes[], struct device *alloc_devs[]) { struct skeleton *skel = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); skel->field = skel->format.field; if (skel->field == V4L2_FIELD_ALTERNATE) { @@ -167,8 +168,8 @@ static int queue_setup(struct vb2_queue *vq, skel->field = V4L2_FIELD_TOP; } - if (vq->num_buffers + *nbuffers < 3) - *nbuffers = 3 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 3) + *nbuffers = 3 - q_num_bufs; if (*nplanes) return sizes[0] < skel->format.sizeimage ? -EINVAL : 0;