From nobody Thu Nov 14 05:32:55 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2F8CC41513 for ; Tue, 17 Oct 2023 14:49:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344289AbjJQOtL (ORCPT ); Tue, 17 Oct 2023 10:49:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344145AbjJQOsM (ORCPT ); Tue, 17 Oct 2023 10:48:12 -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 DB532FC; Tue, 17 Oct 2023 07:48:09 -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 47CE9660732E; Tue, 17 Oct 2023 15:48:08 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697554088; bh=QK6vBd/Ng3qHGes+E88MCZd+SSvPo4pf23W9jWiexEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O2WZLl5m09B0lLkU9IyEDTOiRlVLRPRRG1tUgYxmOaM7ZD5dvJ44K96gMRsMzLhHi X0PQzRtc6NYw9Osq8WFIPVpUU1fH2vRZMJ8mgF+mfjmOtSIWwL8LbUiFhzpRFGf2ic 44Phe09NfUdEclc0w2PnmL1xDPrEIkuUzL7CCYyo0Sxj9Vbntbqhe/yzuzoloaYBjE 1aUzjcG/coRQiEw+6hPqRiWTsxoUe8cDofeeBRKlfNDtd8CIF/ML0G1+MOSE/nQRkQ W7tLGe2V+gT5TS1HeYPentYZ1t+dvNUbD2u8BT7KQZs5EPB9hfT4SFt2fXtz1IiB4C tgc/Se5JUT0MA== 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 , Zhou Peng Subject: [PATCH v12 10/56] media: amphion: Stop direct calls to queue num_buffers field Date: Tue, 17 Oct 2023 16:47:10 +0200 Message-Id: <20231017144756.34719-11-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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: Ming Qian CC: Zhou Peng --- drivers/media/platform/amphion/vpu_dbg.c | 8 ++++---- drivers/media/platform/amphion/vpu_v4l2.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/amphion/vpu_dbg.c b/drivers/media/platf= orm/amphion/vpu_dbg.c index a462d6fe4ea9..940e5bda5fa3 100644 --- a/drivers/media/platform/amphion/vpu_dbg.c +++ b/drivers/media/platform/amphion/vpu_dbg.c @@ -87,7 +87,7 @@ static int vpu_dbg_instance(struct seq_file *s, void *dat= a) num =3D scnprintf(str, sizeof(str), "output (%2d, %2d): fmt =3D %c%c%c%c %d x %d, %d;", vb2_is_streaming(vq), - vq->num_buffers, + vb2_get_num_buffers(vq), inst->out_format.pixfmt, inst->out_format.pixfmt >> 8, inst->out_format.pixfmt >> 16, @@ -111,7 +111,7 @@ static int vpu_dbg_instance(struct seq_file *s, void *d= ata) num =3D scnprintf(str, sizeof(str), "capture(%2d, %2d): fmt =3D %c%c%c%c %d x %d, %d;", vb2_is_streaming(vq), - vq->num_buffers, + vb2_get_num_buffers(vq), inst->cap_format.pixfmt, inst->cap_format.pixfmt >> 8, inst->cap_format.pixfmt >> 16, @@ -139,7 +139,7 @@ static int vpu_dbg_instance(struct seq_file *s, void *d= ata) return 0; =20 vq =3D v4l2_m2m_get_src_vq(inst->fh.m2m_ctx); - for (i =3D 0; i < vq->num_buffers; i++) { + for (i =3D 0; i < vb2_get_num_buffers(vq); i++) { struct vb2_buffer *vb; struct vb2_v4l2_buffer *vbuf; =20 @@ -161,7 +161,7 @@ static int vpu_dbg_instance(struct seq_file *s, void *d= ata) } =20 vq =3D v4l2_m2m_get_dst_vq(inst->fh.m2m_ctx); - for (i =3D 0; i < vq->num_buffers; i++) { + for (i =3D 0; i < vb2_get_num_buffers(vq); i++) { struct vb2_buffer *vb; struct vb2_v4l2_buffer *vbuf; =20 diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/plat= form/amphion/vpu_v4l2.c index 0f6e4c666440..87afb4a18d5d 100644 --- a/drivers/media/platform/amphion/vpu_v4l2.c +++ b/drivers/media/platform/amphion/vpu_v4l2.c @@ -439,7 +439,7 @@ int vpu_get_num_buffers(struct vpu_inst *inst, u32 type) else q =3D v4l2_m2m_get_dst_vq(inst->fh.m2m_ctx); =20 - return q->num_buffers; + return vb2_get_num_buffers(q); } =20 static void vpu_m2m_device_run(void *priv) @@ -587,7 +587,7 @@ static int vpu_vb2_start_streaming(struct vb2_queue *q,= unsigned int count) fmt->sizeimage[0], fmt->bytesperline[0], fmt->sizeimage[1], fmt->bytesperline[1], fmt->sizeimage[2], fmt->bytesperline[2], - q->num_buffers); + vb2_get_num_buffers(q)); vb2_clear_last_buffer_dequeued(q); ret =3D call_vop(inst, start, q->type); if (ret) --=20 2.39.2