From patchwork Thu Oct 19 12:52:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 155543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp360986vqb; Thu, 19 Oct 2023 05:57:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEqNvWZd1DAAp2qhecZ0C/4ZHmjVU6CpkjSMprAnKrfr1+wrTN3LwH1o4BVEJVQf9gWT5LH X-Received: by 2002:a05:6a21:788b:b0:131:b3fa:eaaa with SMTP id bf11-20020a056a21788b00b00131b3faeaaamr2139548pzc.61.1697720246761; Thu, 19 Oct 2023 05:57:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697720246; cv=none; d=google.com; s=arc-20160816; b=fFYXWt8JbKNxKCvZb0HzI2c7uu+mr4d9z4I5jylp8PiQ7QX/lFXfDtpgCnPlJRU/g/ TetLeRkJj6BqNsdbEz4PHG1xTCKf94xfWf14aQzmSaSPGeHGUGXlN2xX/p3doZaNx16B nJbaEsNaCVJ3X4aihf2wWQuf3DoPrgpX1+pquUpDglR/CiszEazt4y5oUc7kQ9B96Kwk +Qfa7GD4jsCfHG0ADvdjqQo+2QybO7ZkD9+5DH2IABUOs+opcfXirLC6Ap5UbIhM5hu9 4FoSJTdZW5tJLDUwNTqamKZJ570TNDFk/VUqHKN0thCZJREd2DzMpjjZW496O8kb4Aiy nsOw== 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=9mE4isXMY+sPvFFydzybto5CFyUf4D1YY7+c8Y3rQIY=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=hTmhFyODD3cpH3DlPQn1f2SP8Z3zPvq0z0aC238pK0X3gpIiHGXOtgLalkRpY7xICE JGwTX1FhmvPPgk984Q41x/b1uoZLQIn+57m2zRuhQOB+b7dKnfS7zzlPrEjXHIqnDOSo i3Tv3nFruxOa5wpS3dxAj5oY4S2NqRBoMa+KhHdg7xFrxg7Kum+ajsrIX5XPSi64d7pN irEDZsDCacYKuIAqByzZxbkG+DNnJ0DO6bRN0Oe/PsRu/IYaj9/IJMr9yCSYk/8zvFyV YmAVyIUoz7ZBozAzdSbasb+MM6E6eDyUCr4uopL5bLrjn2+o4PARKQ/xAUGnz+ZUCj1t EaeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=NL2MRYBl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id k36-20020a634b64000000b0056f8fdb4430si4356004pgl.893.2023.10.19.05.57.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 05:57:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=NL2MRYBl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 57E05819ADAC; Thu, 19 Oct 2023 05:57:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346213AbjJSMzZ (ORCPT + 25 others); Thu, 19 Oct 2023 08:55:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345926AbjJSMxQ (ORCPT ); Thu, 19 Oct 2023 08:53:16 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53C62D40; Thu, 19 Oct 2023 05:52:50 -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 60413660733E; Thu, 19 Oct 2023 13:52:48 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697719968; bh=Cxne9UW1Rdv3DqE7yxtW6lkbxfpON9tV+mkocfttCkg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NL2MRYBl+nTe3/yuVeqtXBB/6CVcreZqdbo3L+tLPGcBlDZB6OYHE+3xqMV8DlC1e zTv+q30S+xfeelVU5D4KSUByICt+JUWQav9A+YnN7vMaIhwgWOYG0un68LqziH/XNp /IRtI8FPolDLvWpwDxJdG90M9KHttFcCrFGsJRyHnbnO+M4iOXxa+IAsipJwNy9MPZ k3/S7LRAxPSQgmetrfCRpNFido7+zVtYmtoLQXrqQLy7XEKOIMePmKQvp6P579jSPd GF0/QLv0T7WM2JE+ikzPX/2wygOfFg0tZ+463eiP1CTHvoWEJ+YtKl56kW60tjyk9a SqdDJ9URQSncg== 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 v13 34/56] sample: v4l: Stop direct calls to queue num_buffers field Date: Thu, 19 Oct 2023 14:52:00 +0200 Message-Id: <20231019125222.21370-35-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 agentk.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 (agentk.vger.email [0.0.0.0]); Thu, 19 Oct 2023 05:57:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780188705153393582 X-GMAIL-MSGID: 1780188705153393582 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 --- 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;