On 14/10/2024 11:07, Dikshita Agarwal wrote:
> Implement reqbuf IOCTL op and vb2_queue_setup vb2 op
> in the driver with necessary hooks.
>
> Signed-off-by: Dikshita Agarwal <quic_dikshita@xxxxxxxxxxx>
> ---
> drivers/media/platform/qcom/iris/Makefile | 7 +-
> drivers/media/platform/qcom/iris/iris_buffer.c | 119 +++++++++++++++++++++
> drivers/media/platform/qcom/iris/iris_buffer.h | 107 ++++++++++++++++++
> drivers/media/platform/qcom/iris/iris_core.h | 6 ++
> drivers/media/platform/qcom/iris/iris_hfi_common.h | 3 +
> .../platform/qcom/iris/iris_hfi_gen1_command.c | 40 +++++++
> .../platform/qcom/iris/iris_hfi_gen1_defines.h | 47 +++++++-
> .../platform/qcom/iris/iris_hfi_gen1_response.c | 79 +++++++++++++-
> drivers/media/platform/qcom/iris/iris_hfi_gen2.h | 5 +
> .../platform/qcom/iris/iris_hfi_gen2_command.c | 105 ++++++++++++++++++
> .../platform/qcom/iris/iris_hfi_gen2_defines.h | 34 ++++++
> .../platform/qcom/iris/iris_hfi_gen2_packet.c | 39 +++++++
> .../platform/qcom/iris/iris_hfi_gen2_packet.h | 7 ++
> .../platform/qcom/iris/iris_hfi_gen2_response.c | 108 ++++++++++++++++++-
> drivers/media/platform/qcom/iris/iris_instance.h | 22 ++++
> .../platform/qcom/iris/iris_platform_common.h | 5 +
> .../platform/qcom/iris/iris_platform_sm8550.c | 6 ++
> drivers/media/platform/qcom/iris/iris_probe.c | 2 +
> drivers/media/platform/qcom/iris/iris_utils.c | 51 +++++++++
> drivers/media/platform/qcom/iris/iris_utils.h | 38 +++++++
> drivers/media/platform/qcom/iris/iris_vb2.c | 77 +++++++++++++
> drivers/media/platform/qcom/iris/iris_vb2.h | 12 +++
> drivers/media/platform/qcom/iris/iris_vdec.c | 58 ++++++++++
> drivers/media/platform/qcom/iris/iris_vdec.h | 14 +++
> drivers/media/platform/qcom/iris/iris_vidc.c | 78 ++++++++++++++
> drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 19 ++++
> drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 15 +++
> 27 files changed, 1095 insertions(+), 8 deletions(-)
>
<snip>
> diff --git a/drivers/media/platform/qcom/iris/iris_vb2.c b/drivers/media/platform/qcom/iris/iris_vb2.c
> new file mode 100644
> index 000000000000..f89891e52fde
> --- /dev/null
> +++ b/drivers/media/platform/qcom/iris/iris_vb2.c
> @@ -0,0 +1,77 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#include "iris_buffer.h"
> +#include "iris_instance.h"
> +#include "iris_vb2.h"
> +#include "iris_vpu_buffer.h"
> +
> +int iris_vb2_queue_setup(struct vb2_queue *q,
> + unsigned int *num_buffers, unsigned int *num_planes,
> + unsigned int sizes[], struct device *alloc_devs[])
> +{
> + enum iris_buffer_type buffer_type = 0;
> + struct iris_buffers *buffers;
> + struct iris_inst *inst;
> + struct iris_core *core;
> + struct v4l2_format *f;
> + int ret = 0;
> +
> + inst = vb2_get_drv_priv(q);
> +
> + mutex_lock(&inst->lock);
> +
> + core = inst->core;
> + f = V4L2_TYPE_IS_OUTPUT(q->type) ? inst->fmt_src : inst->fmt_dst;
> +
> + if (*num_planes) {
> + if (*num_planes != f->fmt.pix_mp.num_planes ||
> + sizes[0] < f->fmt.pix_mp.plane_fmt[0].sizeimage) {
> + ret = -EINVAL;
> + goto unlock;
> + }
If *num_planes is set, then there are already buffers allocated and you are
called from VIDIOC_CREATE_BUFS. That should just do a goto unlock here, since
it is always OK to add more buffers as long as they are sufficiently large.
> + }
> +
> + buffer_type = iris_v4l2_type_to_driver(q->type);
> + if (buffer_type == -EINVAL) {
> + ret = -EINVAL;
> + goto unlock;
> + }
> +
> + if (!inst->once_per_session_set) {
> + inst->once_per_session_set = true;
> +
> + ret = core->hfi_ops->session_open(inst);
> + if (ret) {
> + ret = -EINVAL;
> + dev_err(core->dev, "session open failed\n");
> + goto unlock;
> + }
> + }
> +
> + buffers = &inst->buffers[buffer_type];
> + if (!buffers) {
> + ret = -EINVAL;
> + goto unlock;
> + }
> +
> + buffers->min_count = iris_vpu_buf_count(inst, buffer_type);
> + if (*num_buffers < buffers->min_count)
> + *num_buffers = buffers->min_count;
This doesn't look right. Typically you would set the min_reqbufs_allocation
field in vb2_queue before calling vb2_queue_init.
> + buffers->actual_count = *num_buffers;
> + *num_planes = 1;
> +
> + buffers->size = iris_get_buffer_size(inst, buffer_type);
> +
> + if (sizes[0] < buffers->size) {
> + f->fmt.pix_mp.plane_fmt[0].sizeimage = buffers->size;
> + sizes[0] = f->fmt.pix_mp.plane_fmt[0].sizeimage;
> + }
> +
> +unlock:
> + mutex_unlock(&inst->lock);
> +
> + return ret;
> +}
> diff --git a/drivers/media/platform/qcom/iris/iris_vb2.h b/drivers/media/platform/qcom/iris/iris_vb2.h
> new file mode 100644
> index 000000000000..78157a97b86e
> --- /dev/null
> +++ b/drivers/media/platform/qcom/iris/iris_vb2.h
> @@ -0,0 +1,12 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#ifndef _IRIS_VB2_H_
> +#define _IRIS_VB2_H_
> +
> +int iris_vb2_queue_setup(struct vb2_queue *q,
> + unsigned int *num_buffers, unsigned int *num_planes,
> + unsigned int sizes[], struct device *alloc_devs[]);
> +#endif
> diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c
> new file mode 100644
> index 000000000000..7d1ef31c7c44
> --- /dev/null
> +++ b/drivers/media/platform/qcom/iris/iris_vdec.c
> @@ -0,0 +1,58 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#include "iris_buffer.h"
> +#include "iris_instance.h"
> +#include "iris_vdec.h"
> +#include "iris_vpu_buffer.h"
> +
> +#define DEFAULT_WIDTH 320
> +#define DEFAULT_HEIGHT 240
> +
> +void iris_vdec_inst_init(struct iris_inst *inst)
> +{
> + struct v4l2_format *f;
> +
> + inst->fmt_src = kzalloc(sizeof(*inst->fmt_src), GFP_KERNEL);
> + inst->fmt_dst = kzalloc(sizeof(*inst->fmt_dst), GFP_KERNEL);
> +
> + inst->fw_min_count = MIN_BUFFERS;
> +
> + f = inst->fmt_src;
> + f->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
> + f->fmt.pix_mp.width = DEFAULT_WIDTH;
> + f->fmt.pix_mp.height = DEFAULT_HEIGHT;
> + f->fmt.pix_mp.pixelformat = V4L2_PIX_FMT_H264;
> + f->fmt.pix_mp.num_planes = 1;
> + f->fmt.pix_mp.plane_fmt[0].bytesperline = 0;
> + f->fmt.pix_mp.plane_fmt[0].sizeimage = iris_get_buffer_size(inst, BUF_INPUT);
> + f->fmt.pix_mp.field = V4L2_FIELD_NONE;
> + inst->buffers[BUF_INPUT].min_count = iris_vpu_buf_count(inst, BUF_INPUT);
> + inst->buffers[BUF_INPUT].actual_count = inst->buffers[BUF_INPUT].min_count;
> + inst->buffers[BUF_INPUT].size = f->fmt.pix_mp.plane_fmt[0].sizeimage;
> +
> + f = inst->fmt_dst;
> + f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
> + f->fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12;
> + f->fmt.pix_mp.width = ALIGN(DEFAULT_WIDTH, 128);
> + f->fmt.pix_mp.height = ALIGN(DEFAULT_HEIGHT, 32);
> + f->fmt.pix_mp.num_planes = 1;
> + f->fmt.pix_mp.plane_fmt[0].bytesperline = ALIGN(DEFAULT_WIDTH, 128);
> + f->fmt.pix_mp.plane_fmt[0].sizeimage = iris_get_buffer_size(inst, BUF_OUTPUT);
> + f->fmt.pix_mp.field = V4L2_FIELD_NONE;
> + f->fmt.pix_mp.colorspace = V4L2_COLORSPACE_DEFAULT;
> + f->fmt.pix_mp.xfer_func = V4L2_XFER_FUNC_DEFAULT;
> + f->fmt.pix_mp.ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
> + f->fmt.pix_mp.quantization = V4L2_QUANTIZATION_DEFAULT;
> + inst->buffers[BUF_OUTPUT].min_count = iris_vpu_buf_count(inst, BUF_OUTPUT);
> + inst->buffers[BUF_OUTPUT].actual_count = inst->buffers[BUF_OUTPUT].min_count;
> + inst->buffers[BUF_OUTPUT].size = f->fmt.pix_mp.plane_fmt[0].sizeimage;
> +}
> +
> +void iris_vdec_inst_deinit(struct iris_inst *inst)
> +{
> + kfree(inst->fmt_dst);
> + kfree(inst->fmt_src);
> +}
> diff --git a/drivers/media/platform/qcom/iris/iris_vdec.h b/drivers/media/platform/qcom/iris/iris_vdec.h
> new file mode 100644
> index 000000000000..0324d7f796dd
> --- /dev/null
> +++ b/drivers/media/platform/qcom/iris/iris_vdec.h
> @@ -0,0 +1,14 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#ifndef _IRIS_VDEC_H_
> +#define _IRIS_VDEC_H_
> +
> +struct iris_inst;
> +
> +void iris_vdec_inst_init(struct iris_inst *inst);
> +void iris_vdec_inst_deinit(struct iris_inst *inst);
> +
> +#endif
> diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
> index b8654e73f516..b1a9f0b5380d 100644
> --- a/drivers/media/platform/qcom/iris/iris_vidc.c
> +++ b/drivers/media/platform/qcom/iris/iris_vidc.c
> @@ -9,6 +9,8 @@
>
> #include "iris_vidc.h"
> #include "iris_instance.h"
> +#include "iris_vdec.h"
> +#include "iris_vb2.h"
> #include "iris_platform_common.h"
>
> #define IRIS_DRV_NAME "iris_driver"
> @@ -28,6 +30,38 @@ static void iris_v4l2_fh_deinit(struct iris_inst *inst)
> v4l2_fh_exit(&inst->fh);
> }
>
> +static void iris_add_session(struct iris_inst *inst)
> +{
> + struct iris_core *core = inst->core;
> + struct iris_inst *iter;
> + u32 count = 0;
> +
> + mutex_lock(&core->lock);
> +
> + list_for_each_entry(iter, &core->instances, list)
> + count++;
> +
> + if (count < core->iris_platform_data->max_session_count)
> + list_add_tail(&inst->list, &core->instances);
> +
> + mutex_unlock(&core->lock);
> +}
> +
> +static void iris_remove_session(struct iris_inst *inst)
> +{
> + struct iris_core *core = inst->core;
> + struct iris_inst *iter, *temp;
> +
> + mutex_lock(&core->lock);
> + list_for_each_entry_safe(iter, temp, &core->instances, list) {
> + if (iter->session_id == inst->session_id) {
> + list_del_init(&iter->list);
> + break;
> + }
> + }
> + mutex_unlock(&core->lock);
> +}
> +
> static inline struct iris_inst *iris_get_inst(struct file *filp, void *fh)
> {
> return container_of(filp->private_data, struct iris_inst, fh);
> @@ -59,7 +93,9 @@ iris_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_
> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
> src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
> src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
> + src_vq->ops = inst->core->iris_vb2_ops;
> src_vq->drv_priv = inst;
> + src_vq->buf_struct_size = sizeof(struct iris_buffer);
> src_vq->dev = inst->core->dev;
> src_vq->lock = &inst->ctx_q_lock;
> ret = vb2_queue_init(src_vq);
> @@ -69,7 +105,9 @@ iris_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_
> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
> dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
> dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
> + dst_vq->ops = inst->core->iris_vb2_ops;
> dst_vq->drv_priv = inst;
> + dst_vq->buf_struct_size = sizeof(struct iris_buffer);
> dst_vq->dev = inst->core->dev;
> dst_vq->lock = &inst->ctx_q_lock;
>
> @@ -100,8 +138,11 @@ int iris_open(struct file *filp)
> return -ENOMEM;
>
> inst->core = core;
> + inst->session_id = hash32_ptr(inst);
>
> + mutex_init(&inst->lock);
> mutex_init(&inst->ctx_q_lock);
> + init_completion(&inst->completion);
>
> iris_v4l2_fh_init(inst);
>
> @@ -117,6 +158,10 @@ int iris_open(struct file *filp)
> goto fail_m2m_release;
> }
>
> + iris_vdec_inst_init(inst);
> +
> + iris_add_session(inst);
> +
> inst->fh.m2m_ctx = inst->m2m_ctx;
> filp->private_data = &inst->fh;
>
> @@ -127,19 +172,42 @@ int iris_open(struct file *filp)
> fail_v4l2_fh_deinit:
> iris_v4l2_fh_deinit(inst);
> mutex_destroy(&inst->ctx_q_lock);
> + mutex_destroy(&inst->lock);
> kfree(inst);
>
> return ret;
> }
>
> +static void iris_session_close(struct iris_inst *inst)
> +{
> + const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + bool wait_for_response = true;
> + int ret;
> +
> + reinit_completion(&inst->completion);
> +
> + ret = hfi_ops->session_close(inst);
> + if (ret)
> + wait_for_response = false;
> +
> + if (wait_for_response)
> + iris_wait_for_session_response(inst);
> +}
> +
> int iris_close(struct file *filp)
> {
> struct iris_inst *inst = iris_get_inst(filp, NULL);
>
> v4l2_m2m_ctx_release(inst->m2m_ctx);
> v4l2_m2m_release(inst->m2m_dev);
> + mutex_lock(&inst->lock);
> + iris_vdec_inst_deinit(inst);
> + iris_session_close(inst);
> iris_v4l2_fh_deinit(inst);
> + iris_remove_session(inst);
> + mutex_unlock(&inst->lock);
> mutex_destroy(&inst->ctx_q_lock);
> + mutex_destroy(&inst->lock);
> kfree(inst);
> filp->private_data = NULL;
>
> @@ -155,7 +223,17 @@ static struct v4l2_file_operations iris_v4l2_file_ops = {
> .mmap = v4l2_m2m_fop_mmap,
> };
>
> +static const struct vb2_ops iris_vb2_ops = {
> + .queue_setup = iris_vb2_queue_setup,
> +};
> +
> +static const struct v4l2_ioctl_ops iris_v4l2_ioctl_ops = {
> + .vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs,
Add create_bufs here as well. And you might also consider adding support for remove_bufs.
(but perhaps this is done in later patches).
> +};
> +
> void iris_init_ops(struct iris_core *core)
> {
> core->iris_v4l2_file_ops = &iris_v4l2_file_ops;
> + core->iris_vb2_ops = &iris_vb2_ops;
> + core->iris_v4l2_ioctl_ops = &iris_v4l2_ioctl_ops;
> }
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> new file mode 100644
> index 000000000000..2402a33723ab
> --- /dev/null
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> @@ -0,0 +1,19 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#include "iris_instance.h"
> +#include "iris_vpu_buffer.h"
> +
> +int iris_vpu_buf_count(struct iris_inst *inst, enum iris_buffer_type buffer_type)
> +{
> + switch (buffer_type) {
> + case BUF_INPUT:
> + return MIN_BUFFERS;
> + case BUF_OUTPUT:
> + return inst->fw_min_count;
> + default:
> + return 0;
> + }
> +}
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
> new file mode 100644
> index 000000000000..f0f974cebd8a
> --- /dev/null
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
> @@ -0,0 +1,15 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#ifndef _IRIS_VPU_BUFFER_H_
> +#define _IRIS_VPU_BUFFER_H_
> +
> +struct iris_inst;
> +
> +#define MIN_BUFFERS 4
> +
> +int iris_vpu_buf_count(struct iris_inst *inst, enum iris_buffer_type buffer_type);
> +
> +#endif
>
Regards,
Hans
