From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
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 <benjamin.gaignard@collabora.com>,
"Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Subject: [PATCH v13 38/56] media: ti: Stop direct calls to queue num_buffers field
Date: Thu, 19 Oct 2023 14:52:04 +0200 [thread overview]
Message-ID: <20231019125222.21370-39-benjamin.gaignard@collabora.com> (raw)
In-Reply-To: <20231019125222.21370-1-benjamin.gaignard@collabora.com>
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 <benjamin.gaignard@collabora.com>
CC: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
---
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 = vb2_get_drv_priv(vq);
unsigned size = vpfe->fmt.fmt.pix.sizeimage;
+ unsigned int q_num_bufs = vb2_get_num_buffers(vq);
- if (vq->num_buffers + *nbuffers < 3)
- *nbuffers = 3 - vq->num_buffers;
+ if (q_num_bufs + *nbuffers < 3)
+ *nbuffers = 3 - q_num_bufs;
if (*nplanes) {
if (sizes[0] < size)
diff --git a/drivers/media/platform/ti/cal/cal-video.c b/drivers/media/platform/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 = vb2_get_drv_priv(vq);
unsigned int size = ctx->v_fmt.fmt.pix.sizeimage;
+ unsigned int q_num_bufs = vb2_get_num_buffers(vq);
- if (vq->num_buffers + *nbuffers < 3)
- *nbuffers = 3 - vq->num_buffers;
+ if (q_num_bufs + *nbuffers < 3)
+ *nbuffers = 3 - q_num_bufs;
if (*nplanes) {
if (sizes[0] < size)
diff --git a/drivers/media/platform/ti/davinci/vpif_capture.c b/drivers/media/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 = vb2_get_drv_priv(vq);
struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
unsigned size = common->fmt.fmt.pix.sizeimage;
+ unsigned int q_num_bufs = vb2_get_num_buffers(vq);
vpif_dbg(2, debug, "vpif_buffer_setup\n");
@@ -122,8 +123,8 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
size = sizes[0];
}
- if (vq->num_buffers + *nbuffers < 3)
- *nbuffers = 3 - vq->num_buffers;
+ if (q_num_bufs + *nbuffers < 3)
+ *nbuffers = 3 - q_num_bufs;
*nplanes = 1;
sizes[0] = size;
diff --git a/drivers/media/platform/ti/davinci/vpif_display.c b/drivers/media/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 = vb2_get_drv_priv(vq);
struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
unsigned size = common->fmt.fmt.pix.sizeimage;
+ unsigned int q_num_bufs = vb2_get_num_buffers(vq);
if (*nplanes) {
if (sizes[0] < size)
@@ -122,8 +123,8 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
size = sizes[0];
}
- if (vq->num_buffers + *nbuffers < 3)
- *nbuffers = 3 - vq->num_buffers;
+ if (q_num_bufs + *nbuffers < 3)
+ *nbuffers = 3 - q_num_bufs;
*nplanes = 1;
sizes[0] = size;
diff --git a/drivers/media/platform/ti/omap/omap_vout.c b/drivers/media/platform/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 = vb2_get_drv_priv(vq);
+ unsigned int q_num_bufs = vb2_get_num_buffers(vq);
int size = vout->pix.sizeimage;
- if (is_rotation_enabled(vout) && vq->num_buffers + *nbufs > VRFB_NUM_BUFS) {
- *nbufs = VRFB_NUM_BUFS - vq->num_buffers;
+ if (is_rotation_enabled(vout) && q_num_bufs + *nbufs > VRFB_NUM_BUFS) {
+ *nbufs = VRFB_NUM_BUFS - q_num_bufs;
if (*nbufs == 0)
return -EINVAL;
}
--
2.39.2
next prev parent reply other threads:[~2023-10-19 12:55 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 12:51 [PATCH v13 00/56] Add DELETE_BUF ioctl Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 01/56] media: videobuf2: Rename offset parameter Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 02/56] media: videobuf2: Rework offset 'cookie' encoding pattern Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 03/56] media: videobuf2: Stop spamming kernel log with all queue counter Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 04/56] media: videobuf2: Use vb2_buffer instead of index Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 05/56] media: videobuf2: Access vb2_queue bufs array through helper functions Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 06/56] media: videobuf2: Remove duplicated index vs q->num_buffers check Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 07/56] media: videobuf2: Add helper to get queue number of buffers Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 08/56] media: videobuf2: Use vb2_get_num_buffers() helper Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 09/56] media: amphion: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 10/56] media: amphion: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 11/56] media: mediatek: jpeg: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 12/56] media: mediatek: vdec: Remove useless loop Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 13/56] media: mediatek: vcodec: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 14/56] media: sti: hva: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 15/56] media: visl: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 16/56] media: atomisp: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 17/56] media: atomisp: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 18/56] media: dvb-core: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 19/56] media: dvb-core: Do not initialize twice queue num_buffer field Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 20/56] media: dvb-frontends: rtl2832: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 21/56] media: pci: dt3155: Remove useless check Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 22/56] media: pci: tw686x: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 23/56] media: pci: cx18: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 24/56] media: pci: netup_unidvb: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 25/56] media: pci: tw68: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 26/56] media: i2c: video-i2c: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 27/56] media: coda: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 28/56] media: nxp: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 29/56] media: verisilicon: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 30/56] media: test-drivers: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 31/56] media: imx: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 32/56] media: meson: vdec: " Benjamin Gaignard
2023-10-19 12:51 ` [PATCH v13 33/56] touchscreen: sur40: " Benjamin Gaignard
2023-10-29 2:29 ` Dmitry Torokhov
2023-10-19 12:52 ` [PATCH v13 34/56] sample: v4l: " Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 35/56] media: cedrus: " Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 36/56] media: nuvoton: " Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 37/56] media: renesas: " Benjamin Gaignard
2023-10-19 12:52 ` Benjamin Gaignard [this message]
2023-10-19 12:52 ` [PATCH v13 39/56] media: usb: airspy: " Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 40/56] media: usb: cx231xx: " Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 41/56] media: usb: hackrf: " Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 42/56] media: usb: usbtv: " Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 43/56] media: videobuf2: Be more flexible on the number of queue stored buffers Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 44/56] media: core: Report the maximum possible number of buffers for the queue Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 45/56] media: test-drivers: vivid: Increase max supported buffers for capture queues Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 46/56] media: test-drivers: vicodec: Increase max supported capture queue buffers Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 47/56] media: verisilicon: Refactor postprocessor to store more buffers Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 48/56] media: verisilicon: Store chroma and motion vectors offset Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 49/56] media: verisilicon: g2: Use common helpers to compute chroma and mv offsets Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 50/56] media: verisilicon: vp9: Allow to change resolution while streaming Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 51/56] media: core: Rework how create_buf index returned value is computed Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 52/56] media: core: Add bitmap manage bufs array entries Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 53/56] media: core: Free range of buffers Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 54/56] media: v4l2: Add DELETE_BUFS ioctl Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 55/56] media: v4l2: Add mem2mem helpers for " Benjamin Gaignard
2023-10-19 12:52 ` [PATCH v13 56/56] media: test-drivers: Use helper " Benjamin Gaignard
2023-10-25 12:17 ` [PATCH v13 00/56] Add DELETE_BUF ioctl Hans Verkuil
2023-10-31 9:04 ` Hans Verkuil
2023-10-31 16:37 ` Benjamin Gaignard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231019125222.21370-39-benjamin.gaignard@collabora.com \
--to=benjamin.gaignard@collabora.com \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=kernel@collabora.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-staging@lists.linux.dev \
--cc=m.szyprowski@samsung.com \
--cc=mchehab@kernel.org \
--cc=ming.qian@nxp.com \
--cc=nicolas.dufresne@collabora.com \
--cc=p.zabel@pengutronix.de \
--cc=prabhakar.csengg@gmail.com \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®