From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
To: Andrzej Pietrasiewicz <andrzej.p@collabora.com>,
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,
Daniel Almeida <daniel.almeida@collabora.com>
Subject: Re: [PATCH v15 30/56] media: test-drivers: Stop direct calls to queue num_buffers field
Date: Fri, 10 Nov 2023 10:55:55 +0100 [thread overview]
Message-ID: <84f22803-bd25-4985-a17c-b38bd738b487@collabora.com> (raw)
In-Reply-To: <0b79bb25-2e44-4a6d-b306-76477a2c8a08@collabora.com>
Le 10/11/2023 à 10:35, Andrzej Pietrasiewicz a écrit :
> Hi Benjamin,
>
> W dniu 9.11.2023 o 17:34, Benjamin Gaignard pisze:
>> 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.
>> If 'min_buffers_needed' is set remove useless checks in queue setup
>> functions.
>>
>> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
>> CC: Daniel Almeida <daniel.almeida@collabora.com>
>> ---
>> drivers/media/test-drivers/visl/visl-dec.c | 4 ++--
>> drivers/media/test-drivers/vivid/vivid-meta-cap.c | 3 ---
>> drivers/media/test-drivers/vivid/vivid-meta-out.c | 5 +++--
>> drivers/media/test-drivers/vivid/vivid-touch-cap.c | 5 +++--
>> drivers/media/test-drivers/vivid/vivid-vbi-cap.c | 3 ---
>> drivers/media/test-drivers/vivid/vivid-vbi-out.c | 3 ---
>> drivers/media/test-drivers/vivid/vivid-vid-cap.c | 3 ---
>> drivers/media/test-drivers/vivid/vivid-vid-out.c | 5 +----
>> 8 files changed, 9 insertions(+), 22 deletions(-)
>>
>> diff --git a/drivers/media/test-drivers/visl/visl-dec.c
>> b/drivers/media/test-drivers/visl/visl-dec.c
>> index ba20ea998d19..4672dc5e52bb 100644
>> --- a/drivers/media/test-drivers/visl/visl-dec.c
>> +++ b/drivers/media/test-drivers/visl/visl-dec.c
>> @@ -287,7 +287,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx,
>> struct visl_run *run)
>> frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf);
>> len = 0;
>> - for (i = 0; i < out_q->num_buffers; i++) {
>> + for (i = 0; i < vb2_get_num_buffers(out_q); i++) {
>> char entry[] = "index: %u, state: %s, request_fd: %d, ";
>> u32 old_len = len;
>> struct vb2_buffer *vb2;
>> @@ -347,7 +347,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx,
>> struct visl_run *run)
>> frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf);
>> len = 0;
>> - for (i = 0; i < cap_q->num_buffers; i++) {
>> + for (i = 0; i < vb2_get_num_buffers(cap_q); i++) {
>> u32 old_len = len;
>> struct vb2_buffer *vb2;
>> char *q_status;
>> diff --git a/drivers/media/test-drivers/vivid/vivid-meta-cap.c
>> b/drivers/media/test-drivers/vivid/vivid-meta-cap.c
>> index 780f96860a6d..0a718d037e59 100644
>> --- a/drivers/media/test-drivers/vivid/vivid-meta-cap.c
>> +++ b/drivers/media/test-drivers/vivid/vivid-meta-cap.c
>> @@ -30,9 +30,6 @@ static int meta_cap_queue_setup(struct vb2_queue
>> *vq, unsigned int *nbuffers,
>> sizes[0] = size;
>> }
>> - if (vq->num_buffers + *nbuffers < 2)
>> - *nbuffers = 2 - vq->num_buffers;
>> -
>> *nplanes = 1;
>> return 0;
>> }
>> diff --git a/drivers/media/test-drivers/vivid/vivid-meta-out.c
>> b/drivers/media/test-drivers/vivid/vivid-meta-out.c
>> index 95835b52b58f..4a569a6e58be 100644
>> --- a/drivers/media/test-drivers/vivid/vivid-meta-out.c
>> +++ b/drivers/media/test-drivers/vivid/vivid-meta-out.c
>> @@ -18,6 +18,7 @@ static int meta_out_queue_setup(struct vb2_queue
>> *vq, unsigned int *nbuffers,
>> struct device *alloc_devs[])
>> {
>> struct vivid_dev *dev = vb2_get_drv_priv(vq);
>> + unsigned int q_num_bufs = vb2_get_num_buffers(vq);
>> unsigned int size = sizeof(struct vivid_meta_out_buf);
>> if (!vivid_is_webcam(dev))
>> @@ -30,8 +31,8 @@ static int meta_out_queue_setup(struct vb2_queue
>> *vq, unsigned int *nbuffers,
>> sizes[0] = size;
>> }
>> - if (vq->num_buffers + *nbuffers < 2)
>> - *nbuffers = 2 - vq->num_buffers;
>> + if (q_num_bufs + *nbuffers < 2)
>> + *nbuffers = 2 - q_num_bufs;
>> *nplanes = 1;
>> return 0;
>> diff --git a/drivers/media/test-drivers/vivid/vivid-touch-cap.c
>> b/drivers/media/test-drivers/vivid/vivid-touch-cap.c
>> index c7f6e23df51e..4b3c6ea0afde 100644
>> --- a/drivers/media/test-drivers/vivid/vivid-touch-cap.c
>> +++ b/drivers/media/test-drivers/vivid/vivid-touch-cap.c
>> @@ -13,6 +13,7 @@ static int touch_cap_queue_setup(struct vb2_queue
>> *vq, unsigned int *nbuffers,
>> struct device *alloc_devs[])
>> {
>> struct vivid_dev *dev = vb2_get_drv_priv(vq);
>> + unsigned int q_num_bufs = vb2_get_num_buffers(vq);
>> struct v4l2_pix_format *f = &dev->tch_format;
>> unsigned int size = f->sizeimage;
>> @@ -23,8 +24,8 @@ static int touch_cap_queue_setup(struct vb2_queue
>> *vq, unsigned int *nbuffers,
>> sizes[0] = size;
>> }
>> - if (vq->num_buffers + *nbuffers < 2)
>> - *nbuffers = 2 - vq->num_buffers;
>> + if (q_num_bufs + *nbuffers < 2)
>> + *nbuffers = 2 - q_num_bufs;
>> *nplanes = 1;
>> return 0;
>> diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c
>> b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c
>> index b65b02eeeb97..3840b3a664ac 100644
>> --- a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c
>> +++ b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c
>> @@ -134,9 +134,6 @@ static int vbi_cap_queue_setup(struct vb2_queue *vq,
>> sizes[0] = size;
>> - if (vq->num_buffers + *nbuffers < 2)
>> - *nbuffers = 2 - vq->num_buffers;
>> -
>> *nplanes = 1;
>> return 0;
>> }
>> diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-out.c
>> b/drivers/media/test-drivers/vivid/vivid-vbi-out.c
>> index cd56476902a2..434a10676417 100644
>> --- a/drivers/media/test-drivers/vivid/vivid-vbi-out.c
>> +++ b/drivers/media/test-drivers/vivid/vivid-vbi-out.c
>> @@ -30,9 +30,6 @@ static int vbi_out_queue_setup(struct vb2_queue *vq,
>> sizes[0] = size;
>> - if (vq->num_buffers + *nbuffers < 2)
>> - *nbuffers = 2 - vq->num_buffers;
>> -
>> *nplanes = 1;
>> return 0;
>> }
>> diff --git a/drivers/media/test-drivers/vivid/vivid-vid-cap.c
>> b/drivers/media/test-drivers/vivid/vivid-vid-cap.c
>> index 3a06df35a2d7..2804975fe278 100644
>> --- a/drivers/media/test-drivers/vivid/vivid-vid-cap.c
>> +++ b/drivers/media/test-drivers/vivid/vivid-vid-cap.c
>> @@ -117,9 +117,6 @@ static int vid_cap_queue_setup(struct vb2_queue *vq,
>> dev->fmt_cap->data_offset[p];
>> }
>> - if (vq->num_buffers + *nbuffers < 2)
>> - *nbuffers = 2 - vq->num_buffers;
>> -
>> *nplanes = buffers;
>> dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers);
>
> here the format specifier for "*nbuffers" is "%d"...
>
>> diff --git a/drivers/media/test-drivers/vivid/vivid-vid-out.c
>> b/drivers/media/test-drivers/vivid/vivid-vid-out.c
>> index 184a6df2c29f..1653b2988f7e 100644
>> --- a/drivers/media/test-drivers/vivid/vivid-vid-out.c
>> +++ b/drivers/media/test-drivers/vivid/vivid-vid-out.c
>> @@ -73,12 +73,9 @@ static int vid_out_queue_setup(struct vb2_queue *vq,
>> vfmt->data_offset[p] : size;
>> }
>> - if (vq->num_buffers + *nbuffers < 2)
>> - *nbuffers = 2 - vq->num_buffers;
>> -
>> *nplanes = planes;
>> - dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers);
>> + dprintk(dev, 1, "%s: count=%u\n", __func__, *nbuffers);
>
> ... but here you change it to "%u". Is there a reason for these two to be
> different? I didn't notice it in the previous version but now it
> stands out
> clearly. Probably you changed to %u because of the type returned by
> vb2_get_num_buffers(). And, actually, *nbuffers _is_ unsigned, too.
Like you said *nbuffers is unsigned so %u sound for me.
The goal of this patch was to avoid vq->num_buffers usage not to clean up all the
file.
That could be done in other patch since there is lot to do here.
Regards,
Benjamin
>
> Regards,
>
> Andrzej
>
>> for (p = 0; p < planes; p++)
>> dprintk(dev, 1, "%s: size[%u]=%u\n", __func__, p, sizes[p]);
>> return 0;
>
next prev parent reply other threads:[~2023-11-10 9:58 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-09 16:34 [PATCH v15 13/56] media: mediatek: vcodec: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 14/56] media: sti: hva: Remove useless check Benjamin Gaignard
2023-11-10 9:24 ` Andrzej Pietrasiewicz
2023-11-09 16:34 ` [PATCH v15 15/56] media: visl: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 16/56] media: atomisp: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 17/56] media: atomisp: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 18/56] media: dvb-core: Use vb2_get_buffer() instead of directly access to buffers array Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 19/56] media: dvb-core: Do not initialize twice queue num_buffer field Benjamin Gaignard
2023-11-10 9:25 ` Andrzej Pietrasiewicz
2023-11-09 16:34 ` [PATCH v15 20/56] media: dvb-frontends: rtl2832: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 21/56] media: pci: dt3155: Remove useless check Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 22/56] media: pci: tw686x: Stop direct calls to queue num_buffers field Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 23/56] media: pci: cx18: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 24/56] media: pci: netup_unidvb: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 25/56] media: pci: tw68: " Benjamin Gaignard
2023-11-10 9:26 ` Andrzej Pietrasiewicz
2023-11-09 16:34 ` [PATCH v15 26/56] media: i2c: video-i2c: " Benjamin Gaignard
2023-11-10 9:27 ` Andrzej Pietrasiewicz
2023-11-09 16:34 ` [PATCH v15 27/56] media: coda: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 28/56] media: nxp: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 29/56] media: verisilicon: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 30/56] media: test-drivers: " Benjamin Gaignard
2023-11-10 9:35 ` Andrzej Pietrasiewicz
2023-11-10 9:55 ` Benjamin Gaignard [this message]
2023-11-10 11:03 ` Andrzej Pietrasiewicz
2023-11-09 16:34 ` [PATCH v15 31/56] media: imx: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 32/56] media: meson: vdec: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 33/56] touchscreen: sur40: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 34/56] sample: v4l: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 35/56] media: cedrus: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 36/56] media: nuvoton: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 37/56] media: renesas: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 38/56] media: ti: " Benjamin Gaignard
2023-11-09 20:21 ` Lad, Prabhakar
2023-11-09 16:34 ` [PATCH v15 39/56] media: usb: airspy: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 40/56] media: usb: cx231xx: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 41/56] media: usb: hackrf: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 42/56] media: usb: usbtv: " Benjamin Gaignard
2023-11-09 16:34 ` [PATCH v15 43/56] media videobuf2: Be more flexible on the number of queue stored buffers Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 44/56] media: core: Report the maximum possible number of buffers for the queue Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 45/56] media: test-drivers: vivid: Increase max supported buffers for capture queues Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 46/56] media: test-drivers: vicodec: Increase max supported capture queue buffers Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 47/56] media: verisilicon: Refactor postprocessor to store more buffers Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 48/56] media: verisilicon: Store chroma and motion vectors offset Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 49/56] media: verisilicon: g2: Use common helpers to compute chroma and mv offsets Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 50/56] media: verisilicon: vp9: Allow to change resolution while streaming Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 51/56] media: core: Rework how create_buf index returned value is computed Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 52/56] media: core: Add bitmap manage bufs array entries Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 53/56] media: core: Free range of buffers Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 54/56] media: v4l2: Add DELETE_BUFS ioctl Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 55/56] media: v4l2: Add mem2mem helpers for " Benjamin Gaignard
2023-11-09 16:35 ` [PATCH v15 56/56] media: test-drivers: Use helper " 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=84f22803-bd25-4985-a17c-b38bd738b487@collabora.com \
--to=benjamin.gaignard@collabora.com \
--cc=andrzej.p@collabora.com \
--cc=daniel.almeida@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=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