From nobody Thu Nov 14 05:06:21 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 E0034C41513 for ; Tue, 17 Oct 2023 14:48:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344112AbjJQOsi (ORCPT ); Tue, 17 Oct 2023 10:48:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344135AbjJQOsL (ORCPT ); Tue, 17 Oct 2023 10:48:11 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AECCFA; 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 BFC0B660732A; Tue, 17 Oct 2023 15:48:07 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697554088; bh=FY7GH0xZdlXO2pRrzaejblo22FLeSWf56n9mo0hrqhY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bZUc9Y7SvA5unAnAFhBLlfrD4b/UsnNPqJre51LLMtkk9b/SNUAaiyng2Ih4MEAvt JeqtJQgI2gtWTu7Z2z3xZnSgJWyQO4gUEq16nJ7V+xGXNajj/3+bHBuvjTWP0brwwN gEvaL61W0iVQUWiuq7FC/KNzGQYZ+y+Gfc7LLo/9UHA7rMAoKGAlZNsPJK0glD0pkV 5OsZNuhKhU4FmPVKnTZ9SdSTABXjqGTOm5LGwA7w1LUwi6c8p29yFzi5CkcNwaptER RoifIh0vhWNCaS44PD/7tHKuTPv1hsMzncC3GA6NPoBtv72DdIYQkQUS95qxW4ogFn jKg/b3zaMoJpA== 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 09/56] media: amphion: Use vb2_get_buffer() instead of directly access to buffers array Date: Tue, 17 Oct 2023 16:47:09 +0200 Message-Id: <20231017144756.34719-10-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_buffer() instead of direct access to the vb2_queue bufs array. This allows us to change the type of the bufs in the future. After each call to vb2_get_buffer() we need to be sure that we get a valid pointer so check the return value of all of them. Signed-off-by: Benjamin Gaignard CC: Ming Qian CC: Zhou Peng --- drivers/media/platform/amphion/vpu_dbg.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/amphion/vpu_dbg.c b/drivers/media/platf= orm/amphion/vpu_dbg.c index 982c2c777484..a462d6fe4ea9 100644 --- a/drivers/media/platform/amphion/vpu_dbg.c +++ b/drivers/media/platform/amphion/vpu_dbg.c @@ -140,11 +140,18 @@ static int vpu_dbg_instance(struct seq_file *s, void = *data) =20 vq =3D v4l2_m2m_get_src_vq(inst->fh.m2m_ctx); for (i =3D 0; i < vq->num_buffers; i++) { - struct vb2_buffer *vb =3D vq->bufs[i]; - struct vb2_v4l2_buffer *vbuf =3D to_vb2_v4l2_buffer(vb); + struct vb2_buffer *vb; + struct vb2_v4l2_buffer *vbuf; + + vb =3D vb2_get_buffer(vq, i); + if (!vb) + continue; =20 if (vb->state =3D=3D VB2_BUF_STATE_DEQUEUED) continue; + + vbuf =3D to_vb2_v4l2_buffer(vb); + num =3D scnprintf(str, sizeof(str), "output [%2d] state =3D %10s, %8s\n", i, vb2_stat_name[vb->state], @@ -155,11 +162,18 @@ static int vpu_dbg_instance(struct seq_file *s, void = *data) =20 vq =3D v4l2_m2m_get_dst_vq(inst->fh.m2m_ctx); for (i =3D 0; i < vq->num_buffers; i++) { - struct vb2_buffer *vb =3D vq->bufs[i]; - struct vb2_v4l2_buffer *vbuf =3D to_vb2_v4l2_buffer(vb); + struct vb2_buffer *vb; + struct vb2_v4l2_buffer *vbuf; + + vb =3D vb2_get_buffer(vq, i); + if (!vb) + continue; =20 if (vb->state =3D=3D VB2_BUF_STATE_DEQUEUED) continue; + + vbuf =3D to_vb2_v4l2_buffer(vb); + num =3D scnprintf(str, sizeof(str), "capture[%2d] state =3D %10s, %8s\n", i, vb2_stat_name[vb->state], --=20 2.39.2