From patchwork Thu Nov 9 16:34:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 163479 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp558725vqs; Thu, 9 Nov 2023 08:38:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IEl95HTkKF+UBoqVLEUMGbATFr/3ND/Dty3xWAuGart+CQ0C9HIoYAbEIOI7Ap5zgwuggQ+ X-Received: by 2002:a17:902:a388:b0:1cc:6fdb:b640 with SMTP id x8-20020a170902a38800b001cc6fdbb640mr5396124pla.56.1699547912962; Thu, 09 Nov 2023 08:38:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699547912; cv=none; d=google.com; s=arc-20160816; b=P0TlhNdIgujE/hW2cVGna5UKtB1GOEzpbbDpR/Jna++civYMISnHHLiK7JXUKi7goi ClSTq0qDbihL1v7ExbQqHsdODmDSO5eaQptUrjOuUV8rox/se6kLn2pPMd5EDiGEPb8E mpS8kNUFV0SwlL7aJMSYipQ5lq+aMerYk2JmuaMAmtFyfTxHrpG3RUzXbp8LMjgxF2I+ SdrxWlSw+bv7HeucQqQ7z98YvpX8CMeu6giR548ZXMoU7VAMehrZWhvIHCjUyk1S+Of6 zu5d2qNx6p1HWHQBpx5HAswgcImthIZrwIW1T/fS9EynetK+S6n8SclsJDQ/vek25U59 u/xg== 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=1/+Lxkbxkr5wpS+uB7VMCTDQQAUTF0dKru7u1Lg24vU=; fh=t4h1l+tS8anPNnwyX0PglXAWKg/D9M9NAbc0AP3vdGI=; b=Tds1SZruNp4RNu8xzsWO+N24YkAJeltuH/pFMv3l1DqIXdel3XefOCd6TX4fpM83zx x4VSmIcFPDMVa5A9AHW1xr8riq8RJJA8zw0mePMNmWIpMO2QSwW20Hivec5Gqjq+0Ey9 7bMMbLRVTxhrY9TlI6ygUXrc5eYBkL2ZS733U/KP1UKD9LjdLqDH2tpZec/40iL4B3IF Fzcy2rEqfzX48nGUR54siwLLYJWZfPbx//mYEYAGhZi73vyeXIAfvSw44tzO9n8az92S 0v4TCU4q0ag76a/ZyST+a8cZa1Y381QqtsSsas8EHVKYD5JrSxnEnGCRNJqMDCzhhhbC RcEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=C2Z3fvqB; 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 j5-20020a170902da8500b001c77674ea94si5946229plx.434.2023.11.09.08.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 08:38:32 -0800 (PST) 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=C2Z3fvqB; 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 F17AE837C4A9; Thu, 9 Nov 2023 08:38:31 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344550AbjKIQiR (ORCPT + 31 others); Thu, 9 Nov 2023 11:38:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344353AbjKIQiB (ORCPT ); Thu, 9 Nov 2023 11:38:01 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 564B73A9D; Thu, 9 Nov 2023 08:37:54 -0800 (PST) Received: from benjamin-XPS-13-9310.. (cola.collaboradmins.com [195.201.22.229]) (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 414F666076A9; Thu, 9 Nov 2023 16:37:52 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699547873; bh=tH0dDZoY7AzlQtbTMci7rFl4joXADXoUOtykCWAO0ag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C2Z3fvqBe7KzpKhhXolyZoXKhY8XlKdqkwyaHfS4j7hR0A+KSc3wqDK00rvTk1QlQ DlNaoCYh0e0KuZrEFnIIPt1wxg/PJ/JhzIHpKTaA74980sRTyRI5TpHLqizYVX8BIZ Ro31Ec6rZE7u6i4/VPruIg8rEe/gc2xycCNvAJgSAR9/2mK9lYjpQzwofp9+7WUDNx 3YH/e0E4vdI6R+/vaOg6h7pnl7NeuIQOcuIPswD95elNNWL+FpR+9VyDYxf9TJ4z+W SOAqsDyN20SJ3l4V2GnTuzra5nVRwaNMMbkfb3dOb23Kpg+OchP6RWnTmllC6zrZPX Zt3lCj0D2lwWQ== 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 , Andrzej Pietrasiewicz Subject: [PATCH v15 22/56] media: pci: tw686x: Stop direct calls to queue num_buffers field Date: Thu, 9 Nov 2023 17:34:38 +0100 Message-Id: <20231109163512.179524-23-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231109163512.179524-14-benjamin.gaignard@collabora.com> References: <20231109163512.179524-14-benjamin.gaignard@collabora.com> MIME-Version: 1.0 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]); Thu, 09 Nov 2023 08:38:32 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782105152417459627 X-GMAIL-MSGID: 1782105152417459627 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 Reviewed-by: Andrzej Pietrasiewicz CC: Ezequiel Garcia --- drivers/media/pci/tw686x/tw686x-video.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/tw686x/tw686x-video.c b/drivers/media/pci/tw686x/tw686x-video.c index 3ebf7a2c95f0..6bc6d143d18c 100644 --- a/drivers/media/pci/tw686x/tw686x-video.c +++ b/drivers/media/pci/tw686x/tw686x-video.c @@ -423,6 +423,7 @@ static int tw686x_queue_setup(struct vb2_queue *vq, unsigned int sizes[], struct device *alloc_devs[]) { struct tw686x_video_channel *vc = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); unsigned int szimage = (vc->width * vc->height * vc->format->depth) >> 3; @@ -430,8 +431,8 @@ static int tw686x_queue_setup(struct vb2_queue *vq, * Let's request at least three buffers: two for the * DMA engine and one for userspace. */ - if (vq->num_buffers + *nbuffers < 3) - *nbuffers = 3 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 3) + *nbuffers = 3 - q_num_bufs; if (*nplanes) { if (*nplanes != 1 || sizes[0] < szimage)