From patchwork Tue Oct 31 16:30: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: 160201 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b90f:0:b0:403:3b70:6f57 with SMTP id t15csp363860vqg; Tue, 31 Oct 2023 09:33:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFkt+lZxL5CV9V8HTFq+nU2UGOhrcNedDAaGLtiN00faidkTWmAvHlZAxX3cJnnUjoB5pqn X-Received: by 2002:a17:902:f947:b0:1c6:d0a:cf01 with SMTP id kx7-20020a170902f94700b001c60d0acf01mr149522plb.11.1698770010834; Tue, 31 Oct 2023 09:33:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698770010; cv=none; d=google.com; s=arc-20160816; b=UU1z9+Se6iGNqJ59LO7AYgHCI/qh3x/3X9UTnHKJ2hdljYHIWwcjplE2uJhwh+kqXp wM/j+jFPlNIixHZQsvcSFsUvfrKKGqvqKh/VOjhfEeDW3B3GS4urO08VnhmTTc+a4tHo 8dvqw6J7LuS9Beh8eyMVMcz7/5bLdKu90fjl8l1Q7wEZPQk+6Flx8cdUdkEN/O44mkiE OMCuQ5EvoXOIhkhi4UgJHpVi5e73VHanU/579ygAKS5eyNq2/n70QFdinSaYecvxhHp/ FO6KJFjC6RnxDo8MN5sLe+zdUGDM9IrDzn4XO7YP8oIn8QbpxSYRQxBh2saVdF0/nP9z k2dA== 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=qi0nDE9bMNN/N9JtsneH7OSkITzRhDazbSs/TwPJl7k=; fh=nyy6kl3x7bvRns0O2iGfKgaQnRSGFqx2aqkUiW72Nok=; b=vkgEa4k9UXtfmjfO5dUYbgTOkTVMgcrDtJoz191+LjytY3FCc/gypKCuzcZ+CBZwc6 2EqIf5g+JDAVm/0U0sbs1KrcmjGLmezBlPY9xeRqUTaYCt0v10BqGQmJe8YEu5JGTWWp DrSEk3mQb65f8Xl6pnRcQlgkhfm+zh+OUrvluQpa+fbuBNjCnAtgurU0UUvVov4OwGIb NgSaLqDslJN4yyjAlF2sa5QoKzgoNr43H6l9cwsYkb19TQ0DDiOB9NHdoOG5FqrnCStI Lng/H3OvLBYeEnnyNxjr7fS2zVD5jMTr9TqEeMUij4NYsAemvqS72xw7IMEjc1iPNIBg R0dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=cZkU1yaD; 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 y4-20020a17090322c400b001cad3a744aesi1214675plg.153.2023.10.31.09.33.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 09:33:30 -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=cZkU1yaD; 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 A8871801B9E0; Tue, 31 Oct 2023 09:33:29 -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 S1346185AbjJaQdP (ORCPT + 33 others); Tue, 31 Oct 2023 12:33:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346151AbjJaQcY (ORCPT ); Tue, 31 Oct 2023 12:32:24 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DA91D6F; Tue, 31 Oct 2023 09:31:56 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:c562:2ef4:80c0:92f]) (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 A3D6C66073D4; Tue, 31 Oct 2023 16:31:53 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1698769914; bh=QC82AXVc6xizeIJsB4Zdjgq5ICrOlS6NNBj04+AQSGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cZkU1yaD6X7Q0pinG+R4/8/q3wT+GUj3BQ6kKWXxQJfXU0TcceSsl8sOtEtvebV1M 5ALA7DwdsJ9GRfJATTS41S0C1uioVBgjnvBz289ZOhMxWmMiWZpMUVoWVkMyjIY2LK Uj0c3Sl0mDNXkMJbCaTWARshcVbqsrBsCgo3nkThNZciYOAw0XXHJmUxzSY9qKu2yH BBduwU8Q74RM4FIl77pghSns2d8nc7zhX9ZNdQPxm36raM+CMRGAt1082qIU1m7iUh szcgEsy/eh7PDzLGjDgaTYM/xW9Oy3TF789dQNmw6bmJGyGQsSF/HdTAwKl8yLqBvZ DnVLcMdlvYVMg== 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 , Matt Ranostay Subject: [PATCH v14 26/56] media: i2c: video-i2c: Stop direct calls to queue num_buffers field Date: Tue, 31 Oct 2023 17:30:34 +0100 Message-Id: <20231031163104.112469-27-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031163104.112469-1-benjamin.gaignard@collabora.com> References: <20231031163104.112469-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 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, T_SCC_BODY_TEXT_LINE 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, 31 Oct 2023 09:33:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781289463153532602 X-GMAIL-MSGID: 1781289463153532602 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: Matt Ranostay --- drivers/media/i2c/video-i2c.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index 178bd06cc2ed..ebf2ac98a068 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -405,9 +405,10 @@ static int queue_setup(struct vb2_queue *vq, { struct video_i2c_data *data = vb2_get_drv_priv(vq); unsigned int size = data->chip->buffer_size; + unsigned int q_num_bufs = vb2_get_num_buffers(vq); - if (vq->num_buffers + *nbuffers < 2) - *nbuffers = 2; + if (q_num_bufs + *nbuffers < 2) + *nbuffers = 2 - q_num_bufs; if (*nplanes) return sizes[0] < size ? -EINVAL : 0;