On 8/14/2025 8:13 PM, Vikash Garodia wrote:
>
> On 8/13/2025 3:08 PM, Dikshita Agarwal wrote:
>> Add support for frame size and frame interval enumeration by
>> implementing ENUM_FRAMESIZES/FRAMEINTERVALS V4L2 ioctls for encoder
>> video device with necessary hooks.
>>
>> This allows userspace application to query encoder capabilities and
>> adapt encoding configurations accordingly.
>>
>> Tested-by: Vikash Garodia <quic_vgarodia@xxxxxxxxxxx> # X1E80100
>> Signed-off-by: Dikshita Agarwal <quic_dikshita@xxxxxxxxxxx>
>> ---
>> .../platform/qcom/iris/iris_platform_common.h | 5 +-
>> .../media/platform/qcom/iris/iris_platform_gen2.c | 3 ++
>> .../platform/qcom/iris/iris_platform_sm8250.c | 1 +
>> drivers/media/platform/qcom/iris/iris_vdec.c | 13 +++++
>> drivers/media/platform/qcom/iris/iris_vdec.h | 1 +
>> drivers/media/platform/qcom/iris/iris_venc.c | 13 +++++
>> drivers/media/platform/qcom/iris/iris_venc.h | 1 +
>> drivers/media/platform/qcom/iris/iris_vidc.c | 58 ++++++++++++++++++++--
>> 8 files changed, 91 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
>> index adafdce8a856f9c661aabc5ca28f0faceaa93551..792f46e2e34fd564a1ed61523f72826fc8f74582 100644
>> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
>> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
>> @@ -21,7 +21,8 @@ struct iris_inst;
>> #define DEFAULT_MAX_HOST_BUF_COUNT 64
>> #define DEFAULT_MAX_HOST_BURST_BUF_COUNT 256
>> #define DEFAULT_FPS 30
>> -#define NUM_MBS_8K ((8192 * 4352) / 256)
>> +#define MAXIMUM_FPS 480
>> +#define NUM_MBS_8K ((8192 * 4352) / 256)
>>
>> enum stage_type {
>> STAGE_1 = 1,
>> @@ -179,6 +180,8 @@ struct iris_platform_data {
>> u32 max_session_count;
>> /* max number of macroblocks per frame supported */
>> u32 max_core_mbpf;
>> + /* max number of macroblocks per second supported */
>> + u32 max_core_mbps;
>> const u32 *input_config_params_default;
>> unsigned int input_config_params_default_size;
>> const u32 *input_config_params_hevc;
>> diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
>> index d3026b2bcb708c7ec31f134f628df7e57b54af4f..1e2fadfe17672029b46e07ce00a8e31e0711fd58 100644
>> --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
>> +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
>> @@ -354,6 +354,7 @@ struct iris_platform_data sm8550_data = {
>> .num_vpp_pipe = 4,
>> .max_session_count = 16,
>> .max_core_mbpf = NUM_MBS_8K * 2,
>> + .max_core_mbps = ((7680 * 4320) / 256) * 60,
>> .input_config_params_default =
>> sm8550_vdec_input_config_params_default,
>> .input_config_params_default_size =
>> @@ -429,6 +430,7 @@ struct iris_platform_data sm8650_data = {
>> .num_vpp_pipe = 4,
>> .max_session_count = 16,
>> .max_core_mbpf = NUM_MBS_8K * 2,
>> + .max_core_mbps = ((7680 * 4320) / 256) * 60,
>> .input_config_params_default =
>> sm8550_vdec_input_config_params_default,
>> .input_config_params_default_size =
>> @@ -500,6 +502,7 @@ struct iris_platform_data qcs8300_data = {
>> .num_vpp_pipe = 2,
>> .max_session_count = 16,
>> .max_core_mbpf = ((4096 * 2176) / 256) * 4,
>> + .max_core_mbps = ((7680 * 4320) / 256) * 60, //TODO confirm!!
>
> TODO ? 4k@60 is supported mbps for qcs8300
It was a miss, will remove the TODO.
Thanks,
Dikshita
>
>> .input_config_params_default =
>> sm8550_vdec_input_config_params_default,
>> .input_config_params_default_size =
>> diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
>> index 8d0816a67ae0b6886204ce93fa5ccafaac10392a..2a3cbe1f2d4b27d3cce9e9cdad1525801d71a041 100644
>> --- a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
>> +++ b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
>> @@ -128,6 +128,7 @@ struct iris_platform_data sm8250_data = {
>> .num_vpp_pipe = 4,
>> .max_session_count = 16,
>> .max_core_mbpf = NUM_MBS_8K,
>> + .max_core_mbps = ((7680 * 4320) / 256) * 60,
>> .input_config_params_default =
>> sm8250_vdec_input_config_param_default,
>> .input_config_params_default_size =
>> diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c
>> index 3482ff3f18d2bcd592b7eb7d803bf98e29276ebb..6afbd2f89260a233d75d7a0cdf3647236216c9ec 100644
>> --- a/drivers/media/platform/qcom/iris/iris_vdec.c
>> +++ b/drivers/media/platform/qcom/iris/iris_vdec.c
>> @@ -263,6 +263,19 @@ int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f)
>> return 0;
>> }
>>
>> +int iris_vdec_validate_format(struct iris_inst *inst, u32 pixelformat)
>> +{
>> + const struct iris_fmt *fmt = NULL;
>> +
>> + if (pixelformat != V4L2_PIX_FMT_NV12) {
>> + fmt = find_format(inst, pixelformat, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
>> + if (!fmt)
>> + return -EINVAL;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> int iris_vdec_subscribe_event(struct iris_inst *inst, const struct v4l2_event_subscription *sub)
>> {
>> int ret = 0;
>> diff --git a/drivers/media/platform/qcom/iris/iris_vdec.h b/drivers/media/platform/qcom/iris/iris_vdec.h
>> index b24932dc511a65017b1cadbcb984544475bd0723..097e02bfa72b5ac4e46e66c61842df1d9dd4565b 100644
>> --- a/drivers/media/platform/qcom/iris/iris_vdec.h
>> +++ b/drivers/media/platform/qcom/iris/iris_vdec.h
>> @@ -13,6 +13,7 @@ void iris_vdec_inst_deinit(struct iris_inst *inst);
>> int iris_vdec_enum_fmt(struct iris_inst *inst, struct v4l2_fmtdesc *f);
>> int iris_vdec_try_fmt(struct iris_inst *inst, struct v4l2_format *f);
>> int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f);
>> +int iris_vdec_validate_format(struct iris_inst *inst, u32 pixelformat);
>> int iris_vdec_subscribe_event(struct iris_inst *inst, const struct v4l2_event_subscription *sub);
>> void iris_vdec_src_change(struct iris_inst *inst);
>> int iris_vdec_streamon_input(struct iris_inst *inst);
>> diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c
>> index 6bb59ce4fc565d3dcc6185233ef25d2e4d85cb3e..301206253090962abbb4e4eac8ee88e7b359c98d 100644
>> --- a/drivers/media/platform/qcom/iris/iris_venc.c
>> +++ b/drivers/media/platform/qcom/iris/iris_venc.c
>> @@ -270,3 +270,16 @@ int iris_venc_s_fmt(struct iris_inst *inst, struct v4l2_format *f)
>> return -EINVAL;
>> }
>> }
>> +
>> +int iris_venc_validate_format(struct iris_inst *inst, u32 pixelformat)
>> +{
>> + const struct iris_fmt *fmt = NULL;
>> +
>> + if (pixelformat != V4L2_PIX_FMT_NV12) {
>> + fmt = find_format(inst, pixelformat, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
>> + if (!fmt)
>> + return -EINVAL;
>> + }
>> +
>> + return 0;
>> +}
>> diff --git a/drivers/media/platform/qcom/iris/iris_venc.h b/drivers/media/platform/qcom/iris/iris_venc.h
>> index eb26a3ecbd98b3f02dfdea0dfc41bcd3a90904b6..04fd41275547c40c359c6ea04dfe4ee31d2d0df6 100644
>> --- a/drivers/media/platform/qcom/iris/iris_venc.h
>> +++ b/drivers/media/platform/qcom/iris/iris_venc.h
>> @@ -13,5 +13,6 @@ 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);
>> +int iris_venc_validate_format(struct iris_inst *inst, u32 pixelformat);
>>
>> #endif
>> diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
>> index 06b2737c5892ebbcf43b4cff66062d85cf805c20..cb1280c0c6c82187243f0bda4d98e42370ee787c 100644
>> --- a/drivers/media/platform/qcom/iris/iris_vidc.c
>> +++ b/drivers/media/platform/qcom/iris/iris_vidc.c
>> @@ -373,13 +373,18 @@ static int iris_enum_framesizes(struct file *filp, void *fh,
>> {
>> struct iris_inst *inst = iris_get_inst(filp, NULL);
>> struct platform_inst_caps *caps;
>> + int ret = 0;
>>
>> if (fsize->index)
>> return -EINVAL;
>>
>> - if (fsize->pixel_format != V4L2_PIX_FMT_H264 &&
>> - fsize->pixel_format != V4L2_PIX_FMT_NV12)
>> - return -EINVAL;
>> + if (inst->domain == DECODER)
>> + ret = iris_vdec_validate_format(inst, fsize->pixel_format);
>> + else
>> + ret = iris_venc_validate_format(inst, fsize->pixel_format);
>> +
>> + if (ret)
>> + return ret;
>>
>> caps = inst->core->iris_platform_data->inst_caps;
>>
>> @@ -391,6 +396,51 @@ static int iris_enum_framesizes(struct file *filp, void *fh,
>> fsize->stepwise.max_height = caps->max_frame_height;
>> fsize->stepwise.step_height = STEP_HEIGHT;
>>
>> + return ret;
>> +}
>> +
>> +static int iris_enum_frameintervals(struct file *filp, void *fh,
>> + struct v4l2_frmivalenum *fival)
>> +
>> +{
>> + struct iris_inst *inst = iris_get_inst(filp, NULL);
>> + struct platform_inst_caps *caps;
>> + struct iris_core *core = inst->core;
>> + u32 fps, mbpf;
>> + int ret = 0;
>> +
>> + if (inst->domain == DECODER)
>> + return -ENOTTY;
>> +
>> + if (fival->index)
>> + return -EINVAL;
>> +
>> + ret = iris_venc_validate_format(inst, fival->pixel_format);
>> + if (ret)
>> + return ret;
>> +
>> + if (!fival->width || !fival->height)
>> + return -EINVAL;
>> +
>> + caps = inst->core->iris_platform_data->inst_caps;
>> + if (fival->width > caps->max_frame_width ||
>> + fival->width < caps->min_frame_width ||
>> + fival->height > caps->max_frame_height ||
>> + fival->height < caps->min_frame_height)
>> + return -EINVAL;
>> +
>> + mbpf = NUM_MBS_PER_FRAME(fival->height, fival->width);
>> + fps = DIV_ROUND_UP(core->iris_platform_data->max_core_mbps, mbpf);
>> +
>> + fival->type = V4L2_FRMIVAL_TYPE_STEPWISE;
>> + fival->stepwise.min.numerator = 1;
>> + fival->stepwise.min.denominator =
>> + min_t(u32, fps, MAXIMUM_FPS);
>> + fival->stepwise.max.numerator = 1;
>> + fival->stepwise.max.denominator = 1;
>> + fival->stepwise.step.numerator = 1;
>> + fival->stepwise.step.denominator = MAXIMUM_FPS;
>> +
>> return 0;
>> }
>>
>> @@ -525,6 +575,8 @@ static const struct v4l2_ioctl_ops iris_v4l2_ioctl_ops_enc = {
>> .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,
>> + .vidioc_enum_framesizes = iris_enum_framesizes,
>> + .vidioc_enum_frameintervals = iris_enum_frameintervals,
>> };
>>
>> void iris_init_ops(struct iris_core *core)
>>
