| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <00c1f4c6-1af2-8d7b-353a-16dc2e74265c@quicinc.com>
Date: Thu, 14 Aug 2025 20:02:16 +0530
From: Vikash Garodia <quic_vgarodia@...cinc.com>
To: Dikshita Agarwal <quic_dikshita@...cinc.com>,
Abhinav Kumar
<abhinav.kumar@...ux.dev>,
Bryan O'Donoghue <bryan.odonoghue@...aro.org>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Hans Verkuil
<hverkuil@...all.nl>,
Stefan Schmidt <stefan.schmidt@...aro.org>,
"Vedang
Nagar" <quic_vnagar@...cinc.com>
CC: <linux-media@...r.kernel.org>, <linux-arm-msm@...r.kernel.org>,
<linux-kernel@...r.kernel.org>,
Renjiang Han <quic_renjiang@...cinc.com>,
Wangao Wang <quic_wangaow@...cinc.com>
Subject: Re: [PATCH v2 13/24] media: iris: Add support for ENUM_FMT,
S/G/TRY_FMT encoder
On 8/13/2025 3:08 PM, Dikshita Agarwal wrote:
> Add V4L2 format handling support for the encoder by adding
> implementation of ENUM/S/G/TRY_FMT with necessary hooks.
>
> This ensures that the encoder supports format negotiation consistent
> with V4L2 expectation, enabling userspace applications to configure
> resolution, pixel format and buffer layout properly.
>
> Tested-by: Vikash Garodia <quic_vgarodia@...cinc.com> # X1E80100
> Signed-off-by: Dikshita Agarwal <quic_dikshita@...cinc.com>
> ---
> drivers/media/platform/qcom/iris/iris_core.h | 6 +-
> drivers/media/platform/qcom/iris/iris_instance.h | 11 ++
> drivers/media/platform/qcom/iris/iris_probe.c | 3 +-
> drivers/media/platform/qcom/iris/iris_vdec.h | 11 --
> drivers/media/platform/qcom/iris/iris_venc.c | 207 +++++++++++++++++++++++
> drivers/media/platform/qcom/iris/iris_venc.h | 3 +
> drivers/media/platform/qcom/iris/iris_vidc.c | 41 ++++-
> 7 files changed, 261 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_core.h b/drivers/media/platform/qcom/iris/iris_core.h
> index 09e83be4e00efb456b7098a499b6cce850134a06..827aee8dcec3ee17af5a90f5594b9315f663c0b3 100644
> --- a/drivers/media/platform/qcom/iris/iris_core.h
> +++ b/drivers/media/platform/qcom/iris/iris_core.h
> @@ -40,7 +40,8 @@ enum domain_type {
> * @vdev_dec: iris video device structure for decoder
> * @vdev_enc: iris video device structure for encoder
> * @iris_v4l2_file_ops: iris v4l2 file ops
> - * @iris_v4l2_ioctl_ops: iris v4l2 ioctl ops
> + * @iris_v4l2_ioctl_ops_dec: iris v4l2 ioctl ops for decoder
> + * @iris_v4l2_ioctl_ops_enc: iris v4l2 ioctl ops for encoder
> * @iris_vb2_ops: iris vb2 ops
> * @icc_tbl: table of iris interconnects
> * @icc_count: count of iris interconnects
> @@ -81,7 +82,8 @@ struct iris_core {
> struct video_device *vdev_dec;
> struct video_device *vdev_enc;
> const struct v4l2_file_operations *iris_v4l2_file_ops;
> - const struct v4l2_ioctl_ops *iris_v4l2_ioctl_ops;
> + const struct v4l2_ioctl_ops *iris_v4l2_ioctl_ops_dec;
> + const struct v4l2_ioctl_ops *iris_v4l2_ioctl_ops_enc;
> const struct vb2_ops *iris_vb2_ops;
> struct icc_bulk_data *icc_tbl;
> u32 icc_count;
> diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h
> index ff90f010f1d36690cbadeff0787b1fb7458d7f75..55cf9702111829ef24189986ba5245c7684bfe11 100644
> --- a/drivers/media/platform/qcom/iris/iris_instance.h
> +++ b/drivers/media/platform/qcom/iris/iris_instance.h
> @@ -15,6 +15,17 @@
> #define DEFAULT_WIDTH 320
> #define DEFAULT_HEIGHT 240
>
> +enum iris_fmt_type {
> + IRIS_FMT_H264,
> + IRIS_FMT_HEVC,
> + IRIS_FMT_VP9,
> +};
> +
> +struct iris_fmt {
> + u32 pixfmt;
> + u32 type;
> +};
> +
> /**
> * struct iris_inst - holds per video instance parameters
> *
> diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
> index c3be9deb0a57cc2cf25d69784d54be5e4a5fe06c..0f2596427a773e5c9105b97cb234c8f0a3483226 100644
> --- a/drivers/media/platform/qcom/iris/iris_probe.c
> +++ b/drivers/media/platform/qcom/iris/iris_probe.c
> @@ -157,19 +157,20 @@ static int iris_register_video_device(struct iris_core *core, enum domain_type t
>
> vdev->release = video_device_release;
> vdev->fops = core->iris_v4l2_file_ops;
> - vdev->ioctl_ops = core->iris_v4l2_ioctl_ops;
> vdev->vfl_dir = VFL_DIR_M2M;
> vdev->v4l2_dev = &core->v4l2_dev;
> vdev->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
>
> if (type == DECODER) {
> strscpy(vdev->name, "qcom-iris-decoder", sizeof(vdev->name));
> + vdev->ioctl_ops = core->iris_v4l2_ioctl_ops_dec;
> ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
> if (ret)
> goto err_vdev_release;
> core->vdev_dec = vdev;
> } else if (type == ENCODER) {
> strscpy(vdev->name, "qcom-iris-encoder", sizeof(vdev->name));
> + vdev->ioctl_ops = core->iris_v4l2_ioctl_ops_enc;
> ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
> if (ret)
> goto err_vdev_release;
> diff --git a/drivers/media/platform/qcom/iris/iris_vdec.h b/drivers/media/platform/qcom/iris/iris_vdec.h
> index cd7aab66dc7c82dc50acef9e654a3d6c1ddb088f..b24932dc511a65017b1cadbcb984544475bd0723 100644
> --- a/drivers/media/platform/qcom/iris/iris_vdec.h
> +++ b/drivers/media/platform/qcom/iris/iris_vdec.h
> @@ -8,17 +8,6 @@
>
> struct iris_inst;
>
> -enum iris_fmt_type {
> - IRIS_FMT_H264,
> - IRIS_FMT_HEVC,
> - IRIS_FMT_VP9,
> -};
> -
> -struct iris_fmt {
> - u32 pixfmt;
> - u32 type;
> -};
> -
> int iris_vdec_inst_init(struct iris_inst *inst);
> void iris_vdec_inst_deinit(struct iris_inst *inst);
> int iris_vdec_enum_fmt(struct iris_inst *inst, struct v4l2_fmtdesc *f);
> diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c
> index e418d347ac111c1bc48304adafa259d697e49fed..6bb59ce4fc565d3dcc6185233ef25d2e4d85cb3e 100644
> --- a/drivers/media/platform/qcom/iris/iris_venc.c
> +++ b/drivers/media/platform/qcom/iris/iris_venc.c
> @@ -3,6 +3,8 @@
> * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.
> */
>
> +#include <media/v4l2-mem2mem.h>
> +
> #include "iris_buffer.h"
> #include "iris_instance.h"
> #include "iris_venc.h"
> @@ -63,3 +65,208 @@ void iris_venc_inst_deinit(struct iris_inst *inst)
> kfree(inst->fmt_dst);
> kfree(inst->fmt_src);
> }
> +
> +static const struct iris_fmt iris_venc_formats[] = {
> + [IRIS_FMT_H264] = {
> + .pixfmt = V4L2_PIX_FMT_H264,
> + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
> + },
> + [IRIS_FMT_HEVC] = {
> + .pixfmt = V4L2_PIX_FMT_HEVC,
> + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
> + },
> +};
> +
> +static const struct iris_fmt *
> +find_format(struct iris_inst *inst, u32 pixfmt, u32 type)
> +{
> + const struct iris_fmt *fmt = iris_venc_formats;
> + unsigned int size = ARRAY_SIZE(iris_venc_formats);
> + unsigned int i;
> +
> + for (i = 0; i < size; i++) {
> + if (fmt[i].pixfmt == pixfmt)
> + break;
> + }
> +
> + if (i == size || fmt[i].type != type)
> + return NULL;
> +
> + return &fmt[i];
> +}
> +
> +static const struct iris_fmt *
> +find_format_by_index(struct iris_inst *inst, u32 index, u32 type)
> +{
> + const struct iris_fmt *fmt = iris_venc_formats;
> + unsigned int size = ARRAY_SIZE(iris_venc_formats);
> +
> + if (index >= size || fmt[index].type != type)
> + return NULL;
> +
> + return &fmt[index];
> +}
> +
> +int iris_venc_enum_fmt(struct iris_inst *inst, struct v4l2_fmtdesc *f)
> +{
> + const struct iris_fmt *fmt;
> +
> + switch (f->type) {
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> + if (f->index)
> + return -EINVAL;
> + f->pixelformat = V4L2_PIX_FMT_NV12;
> + break;
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> + fmt = find_format_by_index(inst, f->index, f->type);
> + if (!fmt)
> + return -EINVAL;
> +
> + f->pixelformat = fmt->pixfmt;
> + f->flags = V4L2_FMT_FLAG_COMPRESSED | V4L2_FMT_FLAG_ENC_CAP_FRAME_INTERVAL;
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +int iris_venc_try_fmt(struct iris_inst *inst, struct v4l2_format *f)
> +{
> + struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp;
> + const struct iris_fmt *fmt;
> + struct v4l2_format *f_inst;
> +
> + memset(pixmp->reserved, 0, sizeof(pixmp->reserved));
> + fmt = find_format(inst, pixmp->pixelformat, f->type);
> + switch (f->type) {
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> + if (f->fmt.pix_mp.pixelformat != V4L2_PIX_FMT_NV12) {
> + f_inst = inst->fmt_src;
> + f->fmt.pix_mp.width = f_inst->fmt.pix_mp.width;
> + f->fmt.pix_mp.height = f_inst->fmt.pix_mp.height;
> + f->fmt.pix_mp.pixelformat = f_inst->fmt.pix_mp.pixelformat;
> + }
> + break;
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> + if (!fmt) {
> + f_inst = inst->fmt_dst;
> + f->fmt.pix_mp.width = f_inst->fmt.pix_mp.width;
> + f->fmt.pix_mp.height = f_inst->fmt.pix_mp.height;
> + f->fmt.pix_mp.pixelformat = f_inst->fmt.pix_mp.pixelformat;
> + }
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + if (pixmp->field == V4L2_FIELD_ANY)
> + pixmp->field = V4L2_FIELD_NONE;
> +
> + pixmp->num_planes = 1;
> +
> + return 0;
> +}
> +
> +static int iris_venc_s_fmt_output(struct iris_inst *inst, struct v4l2_format *f)
> +{
> + struct v4l2_format *fmt;
> +
> + iris_venc_try_fmt(inst, f);
> +
> + if (!(find_format(inst, f->fmt.pix_mp.pixelformat, f->type)))
> + return -EINVAL;
> +
> + fmt = inst->fmt_dst;
> + fmt->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
> + fmt->fmt.pix_mp.num_planes = 1;
> + fmt->fmt.pix_mp.plane_fmt[0].bytesperline = 0;
> + fmt->fmt.pix_mp.plane_fmt[0].sizeimage = iris_get_buffer_size(inst, BUF_OUTPUT);
> +
> + if (f->fmt.pix_mp.colorspace != V4L2_COLORSPACE_DEFAULT &&
> + f->fmt.pix_mp.colorspace != V4L2_COLORSPACE_REC709)
> + f->fmt.pix_mp.colorspace = V4L2_COLORSPACE_DEFAULT;
> + fmt->fmt.pix_mp.colorspace = f->fmt.pix_mp.colorspace;
> + fmt->fmt.pix_mp.xfer_func = f->fmt.pix_mp.xfer_func;
> + fmt->fmt.pix_mp.ycbcr_enc = f->fmt.pix_mp.ycbcr_enc;
> + fmt->fmt.pix_mp.quantization = f->fmt.pix_mp.quantization;
> +
> + inst->buffers[BUF_OUTPUT].min_count = iris_vpu_buf_count(inst, BUF_OUTPUT);
> + inst->buffers[BUF_OUTPUT].size = fmt->fmt.pix_mp.plane_fmt[0].sizeimage;
> + fmt->fmt.pix_mp.pixelformat = f->fmt.pix_mp.pixelformat;
> + inst->codec = f->fmt.pix_mp.pixelformat;
> + memcpy(f, fmt, sizeof(struct v4l2_format));
> +
> + return 0;
> +}
> +
> +static int iris_venc_s_fmt_input(struct iris_inst *inst, struct v4l2_format *f)
> +{
> + struct v4l2_format *fmt, *output_fmt;
> +
> + iris_venc_try_fmt(inst, f);
> +
> + if (f->fmt.pix_mp.pixelformat != V4L2_PIX_FMT_NV12)
> + return -EINVAL;
> +
> + fmt = inst->fmt_src;
> + fmt->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
> + fmt->fmt.pix_mp.width = ALIGN(f->fmt.pix_mp.width, 128);
> + fmt->fmt.pix_mp.height = ALIGN(f->fmt.pix_mp.height, 32);
> + fmt->fmt.pix_mp.num_planes = 1;
> + fmt->fmt.pix_mp.pixelformat = f->fmt.pix_mp.pixelformat;
> + fmt->fmt.pix_mp.plane_fmt[0].bytesperline = ALIGN(f->fmt.pix_mp.width, 128);
> + fmt->fmt.pix_mp.plane_fmt[0].sizeimage = iris_get_buffer_size(inst, BUF_INPUT);
> +
> + fmt->fmt.pix_mp.colorspace = f->fmt.pix_mp.colorspace;
> + fmt->fmt.pix_mp.xfer_func = f->fmt.pix_mp.xfer_func;
> + fmt->fmt.pix_mp.ycbcr_enc = f->fmt.pix_mp.ycbcr_enc;
> + fmt->fmt.pix_mp.quantization = f->fmt.pix_mp.quantization;
> +
> + output_fmt = inst->fmt_dst;
> + output_fmt->fmt.pix_mp.width = fmt->fmt.pix_mp.width;
> + output_fmt->fmt.pix_mp.height = fmt->fmt.pix_mp.height;
> + output_fmt->fmt.pix_mp.colorspace = fmt->fmt.pix_mp.colorspace;
> + output_fmt->fmt.pix_mp.xfer_func = fmt->fmt.pix_mp.xfer_func;
> + output_fmt->fmt.pix_mp.ycbcr_enc = fmt->fmt.pix_mp.ycbcr_enc;
> + output_fmt->fmt.pix_mp.quantization = fmt->fmt.pix_mp.quantization;
> +
> + inst->buffers[BUF_INPUT].min_count = iris_vpu_buf_count(inst, BUF_INPUT);
> + inst->buffers[BUF_INPUT].size = fmt->fmt.pix_mp.plane_fmt[0].sizeimage;
> +
> + if (f->fmt.pix_mp.width != inst->crop.width ||
> + f->fmt.pix_mp.height != inst->crop.height) {
> + inst->crop.top = 0;
> + inst->crop.left = 0;
> + inst->crop.width = fmt->fmt.pix_mp.width;
> + inst->crop.height = fmt->fmt.pix_mp.height;
> +
> + iris_venc_s_fmt_output(inst, output_fmt);
> + }
> +
> + memcpy(f, fmt, sizeof(struct v4l2_format));
> +
> + return 0;
> +}
> +
> +int iris_venc_s_fmt(struct iris_inst *inst, struct v4l2_format *f)
> +{
> + struct vb2_queue *q;
> +
> + q = v4l2_m2m_get_vq(inst->m2m_ctx, f->type);
> + if (!q)
> + return -EINVAL;
> +
> + if (vb2_is_busy(q))
> + return -EBUSY;
> +
> + switch (f->type) {
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> + return iris_venc_s_fmt_input(inst, f);
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> + return iris_venc_s_fmt_output(inst, f);
> + default:
> + return -EINVAL;
> + }
> +}
> diff --git a/drivers/media/platform/qcom/iris/iris_venc.h b/drivers/media/platform/qcom/iris/iris_venc.h
> index 8a4cbddd0114b6d0e4ea895362b01c302250c78b..eb26a3ecbd98b3f02dfdea0dfc41bcd3a90904b6 100644
> --- a/drivers/media/platform/qcom/iris/iris_venc.h
> +++ b/drivers/media/platform/qcom/iris/iris_venc.h
> @@ -10,5 +10,8 @@ struct iris_inst;
>
> int iris_venc_inst_init(struct iris_inst *inst);
> void iris_venc_inst_deinit(struct iris_inst *inst);
> +int iris_venc_enum_fmt(struct iris_inst *inst, struct v4l2_fmtdesc *f);
> +int iris_venc_try_fmt(struct iris_inst *inst, struct v4l2_format *f);
> +int iris_venc_s_fmt(struct iris_inst *inst, struct v4l2_format *f);
>
> #endif
> diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
> index 11f27fc867dc610c18022b0942e65aa175a8567e..06b2737c5892ebbcf43b4cff66062d85cf805c20 100644
> --- a/drivers/media/platform/qcom/iris/iris_vidc.c
> +++ b/drivers/media/platform/qcom/iris/iris_vidc.c
> @@ -308,16 +308,26 @@ static int iris_enum_fmt(struct file *filp, void *fh, struct v4l2_fmtdesc *f)
> {
> struct iris_inst *inst = iris_get_inst(filp, NULL);
>
> - return iris_vdec_enum_fmt(inst, f);
> + if (inst->domain == DECODER)
> + return iris_vdec_enum_fmt(inst, f);
> + else if (inst->domain == ENCODER)
> + return iris_venc_enum_fmt(inst, f);
> + else
> + return -EINVAL;
> }
>
> static int iris_try_fmt_vid_mplane(struct file *filp, void *fh, struct v4l2_format *f)
> {
> struct iris_inst *inst = iris_get_inst(filp, NULL);
> - int ret;
> + int ret = 0;
>
> mutex_lock(&inst->lock);
> - ret = iris_vdec_try_fmt(inst, f);
> +
> + if (inst->domain == DECODER)
> + ret = iris_vdec_try_fmt(inst, f);
> + else if (inst->domain == ENCODER)
> + ret = iris_venc_try_fmt(inst, f);
> +
> mutex_unlock(&inst->lock);
>
> return ret;
> @@ -326,10 +336,15 @@ static int iris_try_fmt_vid_mplane(struct file *filp, void *fh, struct v4l2_form
> static int iris_s_fmt_vid_mplane(struct file *filp, void *fh, struct v4l2_format *f)
> {
> struct iris_inst *inst = iris_get_inst(filp, NULL);
> - int ret;
> + int ret = 0;
>
> mutex_lock(&inst->lock);
> - ret = iris_vdec_s_fmt(inst, f);
> +
> + if (inst->domain == DECODER)
> + ret = iris_vdec_s_fmt(inst, f);
> + else if (inst->domain == ENCODER)
> + ret = iris_venc_s_fmt(inst, f);
> +
> mutex_unlock(&inst->lock);
>
> return ret;
> @@ -473,7 +488,7 @@ static const struct vb2_ops iris_vb2_ops = {
> .buf_queue = iris_vb2_buf_queue,
> };
>
> -static const struct v4l2_ioctl_ops iris_v4l2_ioctl_ops = {
> +static const struct v4l2_ioctl_ops iris_v4l2_ioctl_ops_dec = {
> .vidioc_enum_fmt_vid_cap = iris_enum_fmt,
> .vidioc_enum_fmt_vid_out = iris_enum_fmt,
> .vidioc_try_fmt_vid_cap_mplane = iris_try_fmt_vid_mplane,
> @@ -501,9 +516,21 @@ static const struct v4l2_ioctl_ops iris_v4l2_ioctl_ops = {
> .vidioc_decoder_cmd = iris_dec_cmd,
> };
>
> +static const struct v4l2_ioctl_ops iris_v4l2_ioctl_ops_enc = {
> + .vidioc_enum_fmt_vid_cap = iris_enum_fmt,
> + .vidioc_enum_fmt_vid_out = iris_enum_fmt,
> + .vidioc_try_fmt_vid_cap_mplane = iris_try_fmt_vid_mplane,
> + .vidioc_try_fmt_vid_out_mplane = iris_try_fmt_vid_mplane,
> + .vidioc_s_fmt_vid_cap_mplane = iris_s_fmt_vid_mplane,
> + .vidioc_s_fmt_vid_out_mplane = iris_s_fmt_vid_mplane,
> + .vidioc_g_fmt_vid_cap_mplane = iris_g_fmt_vid_mplane,
> + .vidioc_g_fmt_vid_out_mplane = iris_g_fmt_vid_mplane,
> +};
> +
> 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;
> + core->iris_v4l2_ioctl_ops_dec = &iris_v4l2_ioctl_ops_dec;
> + core->iris_v4l2_ioctl_ops_enc = &iris_v4l2_ioctl_ops_enc;
> }
>
Reviewed-by: Vikash Garodia <quic_vgarodia@...cinc.com>
Powered by blists - more mailing lists