| Message ID | 20231215090813.15610-8-benjamin.gaignard@collabora.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add DELETE_BUF ioctl | expand |
On 15/12/2023 10:08, Benjamin Gaignard wrote: > Create v4l2-mem2mem helpers for VIDIOC_DELETE_BUFS ioctl. > > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> > --- > .../media/platform/verisilicon/hantro_drv.c | 1 + > .../media/platform/verisilicon/hantro_v4l2.c | 1 + > drivers/media/test-drivers/vim2m.c | 2 ++ The driver changes should be done in a separate patch. > drivers/media/v4l2-core/v4l2-mem2mem.c | 20 +++++++++++++++++++ > include/media/v4l2-mem2mem.h | 12 +++++++++++ > 5 files changed, 36 insertions(+) > > diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c > index db3df6cc4513..f6b0a676a740 100644 > --- a/drivers/media/platform/verisilicon/hantro_drv.c > +++ b/drivers/media/platform/verisilicon/hantro_drv.c > @@ -248,6 +248,7 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq) > dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; > dst_vq->lock = &ctx->dev->vpu_mutex; > dst_vq->dev = ctx->dev->v4l2_dev.dev; > + src_vq->supports_delete_bufs = true; Isn't this something that can be supported for both queues? > > return vb2_queue_init(dst_vq); > } > diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c > index 941fa23c211a..34eab90e8a42 100644 > --- a/drivers/media/platform/verisilicon/hantro_v4l2.c > +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c > @@ -756,6 +756,7 @@ const struct v4l2_ioctl_ops hantro_ioctl_ops = { > .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf, > .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf, > .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs, > + .vidioc_delete_bufs = v4l2_m2m_ioctl_delete_bufs, > .vidioc_expbuf = v4l2_m2m_ioctl_expbuf, > > .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, > diff --git a/drivers/media/test-drivers/vim2m.c b/drivers/media/test-drivers/vim2m.c > index 3e3b424b4860..17213ce42059 100644 > --- a/drivers/media/test-drivers/vim2m.c > +++ b/drivers/media/test-drivers/vim2m.c > @@ -960,6 +960,7 @@ static const struct v4l2_ioctl_ops vim2m_ioctl_ops = { > .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf, > .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf, > .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs, > + .vidioc_delete_bufs = v4l2_m2m_ioctl_delete_bufs, > .vidioc_expbuf = v4l2_m2m_ioctl_expbuf, > > .vidioc_streamon = v4l2_m2m_ioctl_streamon, > @@ -1133,6 +1134,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, > dst_vq->mem_ops = &vb2_vmalloc_memops; > dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; > dst_vq->lock = &ctx->vb_mutex; > + dst_vq->supports_delete_bufs = true; Same question. > > return vb2_queue_init(dst_vq); > } > diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c > index 9e983176542b..dbc4711fc556 100644 > --- a/drivers/media/v4l2-core/v4l2-mem2mem.c > +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c > @@ -834,6 +834,17 @@ int v4l2_m2m_prepare_buf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, > } > EXPORT_SYMBOL_GPL(v4l2_m2m_prepare_buf); > > +int v4l2_m2m_delete_bufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, > + struct v4l2_delete_buffers *d) > +{ > + struct vb2_queue *vq; > + > + vq = v4l2_m2m_get_vq(m2m_ctx, d->type); These 3 lines can be combined into one. > + > + return vb2_delete_bufs(vq, d); > +} > +EXPORT_SYMBOL_GPL(v4l2_m2m_delete_bufs); I'm not sure we need to export this. Drivers should really just use the v4l2_m2m_ioctl_ variant below. > + > int v4l2_m2m_create_bufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, > struct v4l2_create_buffers *create) > { > @@ -1380,6 +1391,15 @@ int v4l2_m2m_ioctl_create_bufs(struct file *file, void *priv, > } > EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_create_bufs); > > +int v4l2_m2m_ioctl_delete_bufs(struct file *file, void *priv, > + struct v4l2_delete_buffers *d) > +{ > + struct v4l2_fh *fh = file->private_data; > + > + return v4l2_m2m_delete_bufs(file, fh->m2m_ctx, d); > +} > +EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_delete_bufs); > + > int v4l2_m2m_ioctl_querybuf(struct file *file, void *priv, > struct v4l2_buffer *buf) > { > diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h > index 7f1af1f7f912..5314952ad3d5 100644 > --- a/include/media/v4l2-mem2mem.h > +++ b/include/media/v4l2-mem2mem.h > @@ -388,6 +388,16 @@ int v4l2_m2m_dqbuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, > int v4l2_m2m_prepare_buf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, > struct v4l2_buffer *buf); > > +/** > + * v4l2_m2m_delete_bufs() - delete buffers from the queue > + * > + * @file: pointer to struct &file > + * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx > + * @d: pointer to struct &v4l2_delete_buffers > + */ > +int v4l2_m2m_delete_bufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, > + struct v4l2_delete_buffers *d); > + > /** > * v4l2_m2m_create_bufs() - create a source or destination buffer, depending > * on the type > @@ -867,6 +877,8 @@ int v4l2_m2m_ioctl_reqbufs(struct file *file, void *priv, > struct v4l2_requestbuffers *rb); > int v4l2_m2m_ioctl_create_bufs(struct file *file, void *fh, > struct v4l2_create_buffers *create); > +int v4l2_m2m_ioctl_delete_bufs(struct file *file, void *priv, > + struct v4l2_delete_buffers *d); > int v4l2_m2m_ioctl_querybuf(struct file *file, void *fh, > struct v4l2_buffer *buf); > int v4l2_m2m_ioctl_expbuf(struct file *file, void *fh, Regards, Hans
Le 15/01/2024 à 17:50, Hans Verkuil a écrit : > On 15/12/2023 10:08, Benjamin Gaignard wrote: >> Create v4l2-mem2mem helpers for VIDIOC_DELETE_BUFS ioctl. >> >> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> >> --- >> .../media/platform/verisilicon/hantro_drv.c | 1 + >> .../media/platform/verisilicon/hantro_v4l2.c | 1 + >> drivers/media/test-drivers/vim2m.c | 2 ++ > The driver changes should be done in a separate patch. > >> drivers/media/v4l2-core/v4l2-mem2mem.c | 20 +++++++++++++++++++ >> include/media/v4l2-mem2mem.h | 12 +++++++++++ >> 5 files changed, 36 insertions(+) >> >> diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c >> index db3df6cc4513..f6b0a676a740 100644 >> --- a/drivers/media/platform/verisilicon/hantro_drv.c >> +++ b/drivers/media/platform/verisilicon/hantro_drv.c >> @@ -248,6 +248,7 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq) >> dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; >> dst_vq->lock = &ctx->dev->vpu_mutex; >> dst_vq->dev = ctx->dev->v4l2_dev.dev; >> + src_vq->supports_delete_bufs = true; > Isn't this something that can be supported for both queues? For me it isn't useful to support it on the both queues because only capture queue will store unused buffers after a dynamic resolution change. Output queue buffers are smaller and always recycled even after a dynamic resolution change. > >> >> return vb2_queue_init(dst_vq); >> } >> diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c >> index 941fa23c211a..34eab90e8a42 100644 >> --- a/drivers/media/platform/verisilicon/hantro_v4l2.c >> +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c >> @@ -756,6 +756,7 @@ const struct v4l2_ioctl_ops hantro_ioctl_ops = { >> .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf, >> .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf, >> .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs, >> + .vidioc_delete_bufs = v4l2_m2m_ioctl_delete_bufs, >> .vidioc_expbuf = v4l2_m2m_ioctl_expbuf, >> >> .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, >> diff --git a/drivers/media/test-drivers/vim2m.c b/drivers/media/test-drivers/vim2m.c >> index 3e3b424b4860..17213ce42059 100644 >> --- a/drivers/media/test-drivers/vim2m.c >> +++ b/drivers/media/test-drivers/vim2m.c >> @@ -960,6 +960,7 @@ static const struct v4l2_ioctl_ops vim2m_ioctl_ops = { >> .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf, >> .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf, >> .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs, >> + .vidioc_delete_bufs = v4l2_m2m_ioctl_delete_bufs, >> .vidioc_expbuf = v4l2_m2m_ioctl_expbuf, >> >> .vidioc_streamon = v4l2_m2m_ioctl_streamon, >> @@ -1133,6 +1134,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, >> dst_vq->mem_ops = &vb2_vmalloc_memops; >> dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; >> dst_vq->lock = &ctx->vb_mutex; >> + dst_vq->supports_delete_bufs = true; > Same question. I want to test something similar to what the real use case does. > >> >> return vb2_queue_init(dst_vq); >> } >> diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c >> index 9e983176542b..dbc4711fc556 100644 >> --- a/drivers/media/v4l2-core/v4l2-mem2mem.c >> +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c >> @@ -834,6 +834,17 @@ int v4l2_m2m_prepare_buf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, >> } >> EXPORT_SYMBOL_GPL(v4l2_m2m_prepare_buf); >> >> +int v4l2_m2m_delete_bufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, >> + struct v4l2_delete_buffers *d) >> +{ >> + struct vb2_queue *vq; >> + >> + vq = v4l2_m2m_get_vq(m2m_ctx, d->type); > These 3 lines can be combined into one. > >> + >> + return vb2_delete_bufs(vq, d); >> +} >> +EXPORT_SYMBOL_GPL(v4l2_m2m_delete_bufs); > I'm not sure we need to export this. Drivers should really just use the > v4l2_m2m_ioctl_ variant below. ok regards, Benjamin > >> + >> int v4l2_m2m_create_bufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, >> struct v4l2_create_buffers *create) >> { >> @@ -1380,6 +1391,15 @@ int v4l2_m2m_ioctl_create_bufs(struct file *file, void *priv, >> } >> EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_create_bufs); >> >> +int v4l2_m2m_ioctl_delete_bufs(struct file *file, void *priv, >> + struct v4l2_delete_buffers *d) >> +{ >> + struct v4l2_fh *fh = file->private_data; >> + >> + return v4l2_m2m_delete_bufs(file, fh->m2m_ctx, d); >> +} >> +EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_delete_bufs); >> + >> int v4l2_m2m_ioctl_querybuf(struct file *file, void *priv, >> struct v4l2_buffer *buf) >> { >> diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h >> index 7f1af1f7f912..5314952ad3d5 100644 >> --- a/include/media/v4l2-mem2mem.h >> +++ b/include/media/v4l2-mem2mem.h >> @@ -388,6 +388,16 @@ int v4l2_m2m_dqbuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, >> int v4l2_m2m_prepare_buf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, >> struct v4l2_buffer *buf); >> >> +/** >> + * v4l2_m2m_delete_bufs() - delete buffers from the queue >> + * >> + * @file: pointer to struct &file >> + * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx >> + * @d: pointer to struct &v4l2_delete_buffers >> + */ >> +int v4l2_m2m_delete_bufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, >> + struct v4l2_delete_buffers *d); >> + >> /** >> * v4l2_m2m_create_bufs() - create a source or destination buffer, depending >> * on the type >> @@ -867,6 +877,8 @@ int v4l2_m2m_ioctl_reqbufs(struct file *file, void *priv, >> struct v4l2_requestbuffers *rb); >> int v4l2_m2m_ioctl_create_bufs(struct file *file, void *fh, >> struct v4l2_create_buffers *create); >> +int v4l2_m2m_ioctl_delete_bufs(struct file *file, void *priv, >> + struct v4l2_delete_buffers *d); >> int v4l2_m2m_ioctl_querybuf(struct file *file, void *fh, >> struct v4l2_buffer *buf); >> int v4l2_m2m_ioctl_expbuf(struct file *file, void *fh, > Regards, > > Hans >
diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index db3df6cc4513..f6b0a676a740 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -248,6 +248,7 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq) dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; dst_vq->lock = &ctx->dev->vpu_mutex; dst_vq->dev = ctx->dev->v4l2_dev.dev; + src_vq->supports_delete_bufs = true; return vb2_queue_init(dst_vq); } diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c index 941fa23c211a..34eab90e8a42 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -756,6 +756,7 @@ const struct v4l2_ioctl_ops hantro_ioctl_ops = { .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf, .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf, .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs, + .vidioc_delete_bufs = v4l2_m2m_ioctl_delete_bufs, .vidioc_expbuf = v4l2_m2m_ioctl_expbuf, .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, diff --git a/drivers/media/test-drivers/vim2m.c b/drivers/media/test-drivers/vim2m.c index 3e3b424b4860..17213ce42059 100644 --- a/drivers/media/test-drivers/vim2m.c +++ b/drivers/media/test-drivers/vim2m.c @@ -960,6 +960,7 @@ static const struct v4l2_ioctl_ops vim2m_ioctl_ops = { .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf, .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf, .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs, + .vidioc_delete_bufs = v4l2_m2m_ioctl_delete_bufs, .vidioc_expbuf = v4l2_m2m_ioctl_expbuf, .vidioc_streamon = v4l2_m2m_ioctl_streamon, @@ -1133,6 +1134,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->mem_ops = &vb2_vmalloc_memops; dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; dst_vq->lock = &ctx->vb_mutex; + dst_vq->supports_delete_bufs = true; return vb2_queue_init(dst_vq); } diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c index 9e983176542b..dbc4711fc556 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -834,6 +834,17 @@ int v4l2_m2m_prepare_buf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, } EXPORT_SYMBOL_GPL(v4l2_m2m_prepare_buf); +int v4l2_m2m_delete_bufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, + struct v4l2_delete_buffers *d) +{ + struct vb2_queue *vq; + + vq = v4l2_m2m_get_vq(m2m_ctx, d->type); + + return vb2_delete_bufs(vq, d); +} +EXPORT_SYMBOL_GPL(v4l2_m2m_delete_bufs); + int v4l2_m2m_create_bufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, struct v4l2_create_buffers *create) { @@ -1380,6 +1391,15 @@ int v4l2_m2m_ioctl_create_bufs(struct file *file, void *priv, } EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_create_bufs); +int v4l2_m2m_ioctl_delete_bufs(struct file *file, void *priv, + struct v4l2_delete_buffers *d) +{ + struct v4l2_fh *fh = file->private_data; + + return v4l2_m2m_delete_bufs(file, fh->m2m_ctx, d); +} +EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_delete_bufs); + int v4l2_m2m_ioctl_querybuf(struct file *file, void *priv, struct v4l2_buffer *buf) { diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h index 7f1af1f7f912..5314952ad3d5 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -388,6 +388,16 @@ int v4l2_m2m_dqbuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, int v4l2_m2m_prepare_buf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, struct v4l2_buffer *buf); +/** + * v4l2_m2m_delete_bufs() - delete buffers from the queue + * + * @file: pointer to struct &file + * @m2m_ctx: m2m context assigned to the instance given by struct &v4l2_m2m_ctx + * @d: pointer to struct &v4l2_delete_buffers + */ +int v4l2_m2m_delete_bufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, + struct v4l2_delete_buffers *d); + /** * v4l2_m2m_create_bufs() - create a source or destination buffer, depending * on the type @@ -867,6 +877,8 @@ int v4l2_m2m_ioctl_reqbufs(struct file *file, void *priv, struct v4l2_requestbuffers *rb); int v4l2_m2m_ioctl_create_bufs(struct file *file, void *fh, struct v4l2_create_buffers *create); +int v4l2_m2m_ioctl_delete_bufs(struct file *file, void *priv, + struct v4l2_delete_buffers *d); int v4l2_m2m_ioctl_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf); int v4l2_m2m_ioctl_expbuf(struct file *file, void *fh,
Create v4l2-mem2mem helpers for VIDIOC_DELETE_BUFS ioctl. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> --- .../media/platform/verisilicon/hantro_drv.c | 1 + .../media/platform/verisilicon/hantro_v4l2.c | 1 + drivers/media/test-drivers/vim2m.c | 2 ++ drivers/media/v4l2-core/v4l2-mem2mem.c | 20 +++++++++++++++++++ include/media/v4l2-mem2mem.h | 12 +++++++++++ 5 files changed, 36 insertions(+)