From patchwork Tue Oct 17 14:47:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 154324 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4187441vqb; Tue, 17 Oct 2023 07:49:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH4zYCMXnqCh1wMw8qvniMnFTALcw1qggnCSKpvHAz2enGKYEDSBCV9rudd3EZU8FgMkM4S X-Received: by 2002:a17:90b:3510:b0:27d:6268:b75c with SMTP id ls16-20020a17090b351000b0027d6268b75cmr2579338pjb.4.1697554198533; Tue, 17 Oct 2023 07:49:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697554198; cv=none; d=google.com; s=arc-20160816; b=uWc5MHy+FroA8p9yGFhkl4RGjkCZ7KYKBhfKpjdW0NYSX9Ab54hYCMnzWOiBG9zRrx qRpk8Q2DKtJXOPfVWOO/9zK7IeYUXr1oxaoFM060lJl1sn+RIaTHesnxM63quNCAgXCF dsi7i9KirazYTtl4TRu57pJ4U4r9oqvO199uWME6qjqb/TDElbC17jHIARNI67J3m+iB yok3Gn9gjUPTWcEkdfhBUifSp3PMoyW2YpbvMuMWq/8R/s9q+Bmg00OrgrpGrym55skz RoXBkLD3Liv2oSCHa7uRudDNbDESYrgQtKOXpb3tOxKTRcwdsBSbB5DEOVukU8yFhe/b VZdw== 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=jNTSmPn7BAGLuo9zWcrMpUq3ygAV0HysbSzlu12XhZ8=; fh=htjdJE4hfcTI3Ydhhcx4l9rF1suJMuuEBK7FcgcRZDc=; b=WsC6Nr4MHNbsZoQdBWE05TDVC8kfjfXtvll/0ox9dOrUacBKUzOzLKcaEGCQ2hvGZi pCXb/aIdThvAVjWVAX6yZIcpbv8JroZdJaD8SDTOyENx0/I/PWY1ofzAe1uj3TeCoYYQ wNQkrhNBZZ0PuV9ThLbZg1sdqaRUtdyLlfk6HlcsIXq8pZaosvGEwdymf5+huz1akV4B C6RxnTyGfIhHs2A7yztYguRST7AzcyxslegV54BUWP5wjLVZ/IQL6FgaRjMuEs2/gnsT +rbJqOZn9emMqHrin3y7UwootIJ8lyfE/VNZqL/nP/wwdzfxes3mugdcDb3xqG7/0vsf 2bsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=nrymh7zf; 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id v17-20020a17090a899100b0026d6ad52473si8893045pjn.34.2023.10.17.07.49.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 07:49:58 -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=nrymh7zf; 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 9BBA480E65BE; Tue, 17 Oct 2023 07:49:56 -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 S1344404AbjJQOtl (ORCPT + 20 others); Tue, 17 Oct 2023 10:49:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344269AbjJQOs2 (ORCPT ); Tue, 17 Oct 2023 10:48:28 -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 4AEA7192; Tue, 17 Oct 2023 07:48:22 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:7205:da49:a7e8:59f8]) (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 24794660738C; Tue, 17 Oct 2023 15:48:20 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697554100; bh=NS1kCnyNXkwfqRgDrJu8wCuXX9YoJKmdh56bG3MqIZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nrymh7zfZHJDK3yiFeATG3USDmDXqqnsAOWlxLQzY0PJ6nC9u3c/MRYc2n6mvTRkx VzHYm3vMq9W34efdoDuuipewmK4KWQSxjE3IIDh8a1EixQyZL1NPJtJlldErmgDkjC oKiJKOaZIghKifHRlYzZEyIVhYnRDH1bkPCRV0JgPu953m1LK2UuJ1rSzIbM1rGX1h lA+5tTdluj9OckyGtfTBu1MoQM769yqYRr77r+OVlSRXiucCDygJEU5efRkU452mvi rACLrevKGlaz2A91So9C9SRCpPuQISYfiF79lOuqmWGKOcf4M5gbzwyQ0z79vUZWwN mF6qPJ7zq4cMQ== 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 , Neil Armstrong Subject: [PATCH v12 32/56] media: meson: vdec: Stop direct calls to queue num_buffers field Date: Tue, 17 Oct 2023 16:47:32 +0200 Message-Id: <20231017144756.34719-33-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017144756.34719-1-benjamin.gaignard@collabora.com> References: <20231017144756.34719-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,RCVD_IN_DNSWL_BLOCKED, 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]); Tue, 17 Oct 2023 07:49:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780014590758248776 X-GMAIL-MSGID: 1780014590758248776 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 futur. Signed-off-by: Benjamin Gaignard CC: Neil Armstrong --- drivers/staging/media/meson/vdec/vdec.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c index 219185aaa588..1e2369f104c8 100644 --- a/drivers/staging/media/meson/vdec/vdec.c +++ b/drivers/staging/media/meson/vdec/vdec.c @@ -167,22 +167,23 @@ static void process_num_buffers(struct vb2_queue *q, bool is_reqbufs) { const struct amvdec_format *fmt_out = sess->fmt_out; - unsigned int buffers_total = q->num_buffers + *num_buffers; + unsigned int q_num_bufs = vb2_get_num_buffers(q); + unsigned int buffers_total = q_num_bufs + *num_buffers; u32 min_buf_capture = v4l2_ctrl_g_ctrl(sess->ctrl_min_buf_capture); - if (q->num_buffers + *num_buffers < min_buf_capture) - *num_buffers = min_buf_capture - q->num_buffers; + if (q_num_bufs + *num_buffers < min_buf_capture) + *num_buffers = min_buf_capture - q_num_bufs; if (is_reqbufs && buffers_total < fmt_out->min_buffers) - *num_buffers = fmt_out->min_buffers - q->num_buffers; + *num_buffers = fmt_out->min_buffers - q_num_bufs; if (buffers_total > fmt_out->max_buffers) - *num_buffers = fmt_out->max_buffers - q->num_buffers; + *num_buffers = fmt_out->max_buffers - q_num_bufs; /* We need to program the complete CAPTURE buffer list * in registers during start_streaming, and the firmwares * are free to choose any of them to write frames to. As such, * we need all of them to be queued into the driver */ - sess->num_dst_bufs = q->num_buffers + *num_buffers; + sess->num_dst_bufs = q_num_bufs + *num_buffers; q->min_buffers_needed = max(fmt_out->min_buffers, sess->num_dst_bufs); }