Received: by 2002:a05:7412:3784:b0:e2:908c:2ebd with SMTP id jk4csp1454265rdb; Mon, 2 Oct 2023 09:56:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHPJPFXJRDTW4BSbPLPWjE6OGJc8hQ2ttMxRsLSvRa0UpRZx4FtAtyq31pMUGbyj1Z7GHly X-Received: by 2002:a05:6808:316:b0:3a4:35bb:edae with SMTP id i22-20020a056808031600b003a435bbedaemr12238754oie.29.1696265776928; Mon, 02 Oct 2023 09:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696265776; cv=none; d=google.com; s=arc-20160816; b=gL4TY7NJZkwGCPfPDmCKft90f5by2cq2qJEDX17WKYTwJOR8h4h8QxldgH+mZTamDy sOyBPHuT4XFTC0hXPEkD5GTmGqbpQsurIUBw6GJqXkD0wjPjl2h2zQOrXgLXhpyRnHdA QveKik2uHIdKqDAah5k4/FYOrhBYmUSzSbQdcssyAzGA9MYg2eGomMHNSpKtdkT4cDxr xnl7UQKE70F1dXEOj0+WB+SWGtYk60bNhYvraAJQMigTFv3TRIPZapw1d6yRlFDKRheX WlAxqpugxzJIVFt2E7+pBHEV+uKa6qqC3JqhIIa+rE6v5S1IPfhg/NgA8MOHbB18ZMri BYtw== 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=4u0tbnVEtzf7uFUy5O5GUVi6lUPIj12M/GhbBAenuws=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=f36TSoENIKBwFGhaEThltDAV5WNmqeI00DqwxJrBXY1P9tl8OnxlBNtye1C+eELBAR i2WJcM0Pr+KHmVuiyGYeL81kHOSDi7yMiyBcS13X+dxLixYTyL2pA0jIvw5nm4xErpJM fRvS6szpNuRccKhJmK5v7K1Mdt0VJJiwdkIE/jzt+OqxO+Zf9oxLgmaBk++C6MdC+ODg I5GpRJJu4k3959v120Q6KBldln9P9aSDhSRvOsAAf78HQoZyGRNv2piLVfSHiX/uCXze zWPYt0MNGCsuYKrBcVjlhs2lJIAO8Tc55kzfP7EdDqzybmlH/Q6IfkvhrqE/XG9RkLHd FdPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=gDvuJr0Y; 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 Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id n9-20020a17090ade8900b002775298e2efsi7640536pjv.17.2023.10.02.09.56.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 09:56:16 -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=gDvuJr0Y; 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 A5C618131A99; Mon, 2 Oct 2023 05:07:52 -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 S237302AbjJBMHm (ORCPT + 99 others); Mon, 2 Oct 2023 08:07:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236928AbjJBMGl (ORCPT ); Mon, 2 Oct 2023 08:06:41 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 529F1D7; Mon, 2 Oct 2023 05:06:38 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:9537:67ca:c85e:d0ae]) (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 B7CEC66072E6; Mon, 2 Oct 2023 13:06:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1696248397; bh=rkThknrqAdahL7+ESWJTTDJdizQjBtgRoFGagWtq+LE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gDvuJr0Yln1s0Fg3NmCkxvR/G8gewdO494eLn2gB1PDHl5nkzve6X5KbuBnoZquFo Uz4kYKYVfkIMT4b4tk5tKVvpGJ+Aagug2isCedZOUUPlwna9Hz14cncfuyLF9d2cQ/ XpocK5lVt/N6mqR4HWxLiZJlwZOYxW3UZSdbQd+dTcWOcGJYvu57PiLVDwATPRhL/s IKHASWKdsqdlfXegI0bkZLzCKZ5czfYP7RGEa6uDRoj0gPDArWuMwLWG/bqOGY9WZY 4LHmHcA9Yn9DCGk34X4hlT7a3JbKrkPxI3RlnyahPIYonkIr17uArVDwHqSK8j4Lp9 3R0mu/kBRynmg== 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 v9 23/53] media: dvb-frontends: rtl2832_srd: Use queue min_buffers_needed field Date: Mon, 2 Oct 2023 14:05:47 +0200 Message-Id: <20231002120617.119602-24-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231002120617.119602-1-benjamin.gaignard@collabora.com> References: <20231002120617.119602-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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]); Mon, 02 Oct 2023 05:07:52 -0700 (PDT) queue_setup checks for a minimum number of buffers so use queue min_buffers_needed field and remove the check done in rtl2832_sdr_queue_setup(). Signed-off-by: Benjamin Gaignard --- drivers/media/dvb-frontends/rtl2832_sdr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c index 02c619e51641..597b1548ed8b 100644 --- a/drivers/media/dvb-frontends/rtl2832_sdr.c +++ b/drivers/media/dvb-frontends/rtl2832_sdr.c @@ -440,14 +440,9 @@ static int rtl2832_sdr_queue_setup(struct vb2_queue *vq, struct rtl2832_sdr_dev *dev = vb2_get_drv_priv(vq); struct platform_device *pdev = dev->pdev; - dev_dbg(&pdev->dev, "nbuffers=%d\n", *nbuffers); - - /* Need at least 8 buffers */ - if (vq->num_buffers + *nbuffers < 8) - *nbuffers = 8 - vq->num_buffers; *nplanes = 1; sizes[0] = PAGE_ALIGN(dev->buffersize); - dev_dbg(&pdev->dev, "nbuffers=%d sizes[0]=%d\n", *nbuffers, sizes[0]); + dev_dbg(&pdev->dev, "nbuffers=%d sizes[0]=%d\n", vb2_get_num_buffers(vq), sizes[0]); return 0; } @@ -1364,6 +1359,8 @@ static int rtl2832_sdr_probe(struct platform_device *pdev) dev->vb_queue.ops = &rtl2832_sdr_vb2_ops; dev->vb_queue.mem_ops = &vb2_vmalloc_memops; dev->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; + /* Need at least 8 buffers */ + dev->vb_queue.min_buffers_needed = 8; ret = vb2_queue_init(&dev->vb_queue); if (ret) { dev_err(&pdev->dev, "Could not initialize vb2 queue\n"); -- 2.39.2