From nobody Fri Sep 20 11:32:46 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 51D75CDB465 for ; Thu, 19 Oct 2023 12:55:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346019AbjJSMzt (ORCPT ); Thu, 19 Oct 2023 08:55:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346032AbjJSMx5 (ORCPT ); Thu, 19 Oct 2023 08:53:57 -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 306D0D7B; Thu, 19 Oct 2023 05:52:55 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:ccea:1fb5:34eb:239b]) (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 74D306607381; Thu, 19 Oct 2023 13:52:50 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697719970; bh=dzwa/jYB5Q8JSc9NA/K1ZmfJPhSPTZE1y6AwFUzPpGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iFwYFdfdorLwOroxjYpXwLTlBJe7ur0qb0NYAiZvUGLsYpQMVKvLr4IPP8jWMhnRE /OVaqbNLUMf6mg5Tmpy6JKI1IpZ0rRF0jhTAvRjVyfxmdm5etOUb9lorJEgOlgjAny /geajUH0uF34wdFYIYBS1k7oYJ+snXGEboYRheHposCwwWU6+W5CQPfS8JJxvjW4ZV cu59NKLfDw+KuyA75xvVMBYRMMTCxwuS/bBsuPMEe4DTiGv5JZEzOP3XQZcQAYLd1J t2xB1eZlI2BHFCFgwhoXD/HSa9OMSZPlYPrxp4ffdI+PNhgqDCiz/kivtPG/L1udKL a3gLiWXXExwqA== 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 , "Lad, Prabhakar" Subject: [PATCH v13 38/56] media: ti: Stop direct calls to queue num_buffers field Date: Thu, 19 Oct 2023 14:52:04 +0200 Message-Id: <20231019125222.21370-39-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231019125222.21370-1-benjamin.gaignard@collabora.com> References: <20231019125222.21370-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 future. Signed-off-by: Benjamin Gaignard CC: "Lad, Prabhakar" --- drivers/media/platform/ti/am437x/am437x-vpfe.c | 5 +++-- drivers/media/platform/ti/cal/cal-video.c | 5 +++-- drivers/media/platform/ti/davinci/vpif_capture.c | 5 +++-- drivers/media/platform/ti/davinci/vpif_display.c | 5 +++-- drivers/media/platform/ti/omap/omap_vout.c | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/ti/am437x/am437x-vpfe.c b/drivers/media= /platform/ti/am437x/am437x-vpfe.c index 5fa2ea9025d9..f18acf9286a2 100644 --- a/drivers/media/platform/ti/am437x/am437x-vpfe.c +++ b/drivers/media/platform/ti/am437x/am437x-vpfe.c @@ -1771,9 +1771,10 @@ static int vpfe_queue_setup(struct vb2_queue *vq, { struct vpfe_device *vpfe =3D vb2_get_drv_priv(vq); unsigned size =3D vpfe->fmt.fmt.pix.sizeimage; + unsigned int q_num_bufs =3D vb2_get_num_buffers(vq); =20 - if (vq->num_buffers + *nbuffers < 3) - *nbuffers =3D 3 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 3) + *nbuffers =3D 3 - q_num_bufs; =20 if (*nplanes) { if (sizes[0] < size) diff --git a/drivers/media/platform/ti/cal/cal-video.c b/drivers/media/plat= form/ti/cal/cal-video.c index a8abcd0fee17..94e67c057a20 100644 --- a/drivers/media/platform/ti/cal/cal-video.c +++ b/drivers/media/platform/ti/cal/cal-video.c @@ -603,9 +603,10 @@ static int cal_queue_setup(struct vb2_queue *vq, { struct cal_ctx *ctx =3D vb2_get_drv_priv(vq); unsigned int size =3D ctx->v_fmt.fmt.pix.sizeimage; + unsigned int q_num_bufs =3D vb2_get_num_buffers(vq); =20 - if (vq->num_buffers + *nbuffers < 3) - *nbuffers =3D 3 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 3) + *nbuffers =3D 3 - q_num_bufs; =20 if (*nplanes) { if (sizes[0] < size) diff --git a/drivers/media/platform/ti/davinci/vpif_capture.c b/drivers/med= ia/platform/ti/davinci/vpif_capture.c index 99fae8830c41..fc42b4bc37e6 100644 --- a/drivers/media/platform/ti/davinci/vpif_capture.c +++ b/drivers/media/platform/ti/davinci/vpif_capture.c @@ -113,6 +113,7 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq, struct channel_obj *ch =3D vb2_get_drv_priv(vq); struct common_obj *common =3D &ch->common[VPIF_VIDEO_INDEX]; unsigned size =3D common->fmt.fmt.pix.sizeimage; + unsigned int q_num_bufs =3D vb2_get_num_buffers(vq); =20 vpif_dbg(2, debug, "vpif_buffer_setup\n"); =20 @@ -122,8 +123,8 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq, size =3D sizes[0]; } =20 - if (vq->num_buffers + *nbuffers < 3) - *nbuffers =3D 3 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 3) + *nbuffers =3D 3 - q_num_bufs; =20 *nplanes =3D 1; sizes[0] =3D size; diff --git a/drivers/media/platform/ti/davinci/vpif_display.c b/drivers/med= ia/platform/ti/davinci/vpif_display.c index f8ec2991c667..9dbab1003c1d 100644 --- a/drivers/media/platform/ti/davinci/vpif_display.c +++ b/drivers/media/platform/ti/davinci/vpif_display.c @@ -115,6 +115,7 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq, struct channel_obj *ch =3D vb2_get_drv_priv(vq); struct common_obj *common =3D &ch->common[VPIF_VIDEO_INDEX]; unsigned size =3D common->fmt.fmt.pix.sizeimage; + unsigned int q_num_bufs =3D vb2_get_num_buffers(vq); =20 if (*nplanes) { if (sizes[0] < size) @@ -122,8 +123,8 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq, size =3D sizes[0]; } =20 - if (vq->num_buffers + *nbuffers < 3) - *nbuffers =3D 3 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 3) + *nbuffers =3D 3 - q_num_bufs; =20 *nplanes =3D 1; sizes[0] =3D size; diff --git a/drivers/media/platform/ti/omap/omap_vout.c b/drivers/media/pla= tform/ti/omap/omap_vout.c index 4143274089c3..72ce903717d3 100644 --- a/drivers/media/platform/ti/omap/omap_vout.c +++ b/drivers/media/platform/ti/omap/omap_vout.c @@ -944,10 +944,11 @@ static int omap_vout_vb2_queue_setup(struct vb2_queue= *vq, struct device *alloc_devs[]) { struct omap_vout_device *vout =3D vb2_get_drv_priv(vq); + unsigned int q_num_bufs =3D vb2_get_num_buffers(vq); int size =3D vout->pix.sizeimage; =20 - if (is_rotation_enabled(vout) && vq->num_buffers + *nbufs > VRFB_NUM_BUFS= ) { - *nbufs =3D VRFB_NUM_BUFS - vq->num_buffers; + if (is_rotation_enabled(vout) && q_num_bufs + *nbufs > VRFB_NUM_BUFS) { + *nbufs =3D VRFB_NUM_BUFS - q_num_bufs; if (*nbufs =3D=3D 0) return -EINVAL; } --=20 2.39.2