Received: by 2002:a05:7412:3784:b0:e2:908c:2ebd with SMTP id jk4csp1507534rdb; Mon, 2 Oct 2023 11:38:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHPEVGppTk6HSecD5KndTrmaYAo5vq4mrXJCPrzRsTVBdGVl2M8kFBRr2s4kwitqKVMc+8j X-Received: by 2002:a05:6a21:6811:b0:164:c705:383a with SMTP id wr17-20020a056a21681100b00164c705383amr2629936pzb.19.1696271882281; Mon, 02 Oct 2023 11:38:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696271882; cv=none; d=google.com; s=arc-20160816; b=LBLHSCaMrsjbll/59ouX0rOSE6rQcXJn40zaGi7vI2mALgpbAGukKWY+EeYE8wcAly l0fUbzHF3A/vRqMLdUg4DM++Ld1CXMly3vzqFPEkoE/5/kWTI87Cj/hyRdJHXzjYmGy6 tp459R9EbOndCotKfwmZ4Y3hn3KG6AQ2OvbC1sLqPIr/COUJtXegrzEEtSE1elQAT5u2 U5g6+XQZ7kaARN3n5AFDLOTlLRanSZRSStJSNEHPQsjs57HAzBmwWMwFSSBa4+5+FGR0 NVcdeqQWcK2dQkJpbicc+tlvvvLy1B4sZwdxp8wugOQaRfiXsJssg7peElHYFx5uGOZR n1Ag== 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=6Uo+DWz6nzURRzOrpiTlNauRcx9JlP212HftAuLBiRM=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=nGGFL7n9HFGKGcQ+kHGKi+JkmgBvbkUV6a7RiMsf2w9u4ncz0yEaNnQomCWyadBZYi ZSHPgiyQZiToh2PxpT300MR/k5iqlyi+s9o35XdjjAsV2MfOyAWbwk7g19pdYQUHr97+ mUzThImg3bSin4MlD60WhfZjKN2/mlJ9vW1uQDtg1TuJQfCp/t3j8e87682ZUegpsa03 zd8bKPempJrOgV40aFGl6FhWbVTL1VqemuLMvStqSQLrUNWCUW8S91lqaw7xpwFBFgx4 7JSnW3yiuVyNncvcnBsQRTBd3nJ15HGuZi8CUWgSzZx3N7wONHw1gyWydXEwa/kcVZVQ 5GmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=RnjEUJyd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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. [23.128.96.37]) by mx.google.com with ESMTPS id m19-20020a170902d19300b001c730c865f8si10812005plb.320.2023.10.02.11.38.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 11:38:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=RnjEUJyd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 A1C0881393F9; Mon, 2 Oct 2023 05:09:00 -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 S237372AbjJBMI1 (ORCPT + 99 others); Mon, 2 Oct 2023 08:08:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237103AbjJBMHA (ORCPT ); Mon, 2 Oct 2023 08:07:00 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AB89112; Mon, 2 Oct 2023 05:06:47 -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 E4D74660737E; Mon, 2 Oct 2023 13:06:45 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1696248406; bh=pDUB2yjXKjklQT9CTDtddlAytBql2bguZ0k3zUQQEeE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RnjEUJyddo5VrJFi2vWLyHFmZGfKm/tnO6GnugElMcm/bv+0fgbkGVBYnveuqwsnb MgnAeH2ltrrQkSodmx4Z+VBESXrJG3OMZn2Qit/3JAkjz/uzD6tzoOA4FQ3hD/ZwOH eVI1ZGf72788fO9f6YZgei46ca8lJC+B2l2meLvCG0bOGBRhwTAX+AV1mcudwLeXss V6ed/8sCegF3NzGvwff4aIwMHUAKSofoteXYVbnZkS8ggfU/RpzKEynyc3oqIZbGII wFPFo55UFUJJyUtMwkeBPRDprmV7trcedGbXz65qWb8JvaU4N7891zTK3Dm8wYi5A3 LEHmN03tyex4Q== 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 40/53] media: usb: hackrf: Set min_buffers_needed to 8 Date: Mon, 2 Oct 2023 14:06:04 +0200 Message-Id: <20231002120617.119602-41-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:09:00 -0700 (PDT) vb2 queue_setup checks for a minimum number of buffers so set min_buffers_needed to 8 and remove the useless check in hackrf_queue_setup(). Signed-off-by: Benjamin Gaignard --- drivers/media/usb/hackrf/hackrf.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c index 3e535be2c520..2e856b20aa21 100644 --- a/drivers/media/usb/hackrf/hackrf.c +++ b/drivers/media/usb/hackrf/hackrf.c @@ -754,15 +754,10 @@ static int hackrf_queue_setup(struct vb2_queue *vq, { struct hackrf_dev *dev = vb2_get_drv_priv(vq); - dev_dbg(dev->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(dev->dev, "nbuffers=%d sizes[0]=%d\n", *nbuffers, sizes[0]); + dev_dbg(dev->dev, "nbuffers=%u sizes[0]=%d\n", vb2_get_num_buffers(vq), sizes[0]); return 0; } @@ -1392,6 +1387,8 @@ static int hackrf_probe(struct usb_interface *intf, dev->rx_vb2_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE; dev->rx_vb2_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ; + /* Need at least 8 buffers */ + dev->rx_vb2_queue.min_buffers_needed = 8; dev->rx_vb2_queue.ops = &hackrf_vb2_ops; dev->rx_vb2_queue.mem_ops = &vb2_vmalloc_memops; dev->rx_vb2_queue.drv_priv = dev; -- 2.39.2