Re: [PATCH 7/9] media: iris: add MPEG2 decode support on Gen1 firmware
From: Vishnu Reddy
Date: Wed Aug 26 2026 - 00:51:05 EST
On 7/10/2026 1:07 AM, Dmitry Baryshkov wrote:
> The Gen1 firmware supports decoding MPEG2, but the iris driver never
> advertised or wired up the codec.
>
> Add the MPEG2 HFI codec code, map V4L2_PIX_FMT_MPEG2 to it in the Gen1
> session open path, and compute the MPEG2 internal buffer sizes (line
> buffer and the quantisation-matrix / QP-dump persist buffer). Advertise
> the codec through the new Gen1 decode format list and register the MPEG2
> profile and level menu controls so userspace can query them.
>
> Assisted-by: Claude:claude-opus-4-8
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/platform/qcom/iris/iris_ctrls.c | 15 ++++++++++++++
> drivers/media/platform/qcom/iris/iris_hfi_gen1.c | 24 ++++++++++++++++++++++
> .../platform/qcom/iris/iris_hfi_gen1_command.c | 3 +++
> .../platform/qcom/iris/iris_hfi_gen1_defines.h | 1 +
> .../platform/qcom/iris/iris_platform_common.h | 2 ++
> drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 9 +++++++-
> drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 3 +++
> 7 files changed, 56 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c
> index 1bd6460a1b0a..8f9347c1df2b 100644
> --- a/drivers/media/platform/qcom/iris/iris_ctrls.c
> +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c
> @@ -30,12 +30,16 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)
> return PROFILE_VP9;
> case V4L2_CID_MPEG_VIDEO_VP8_PROFILE:
> return PROFILE_VP8;
> + case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE:
> + return PROFILE_MPEG2;
> case V4L2_CID_MPEG_VIDEO_H264_LEVEL:
> return LEVEL_H264;
> case V4L2_CID_MPEG_VIDEO_HEVC_LEVEL:
> return LEVEL_HEVC;
> case V4L2_CID_MPEG_VIDEO_VP9_LEVEL:
> return LEVEL_VP9;
> + case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL:
> + return LEVEL_MPEG2;
> case V4L2_CID_MPEG_VIDEO_HEVC_TIER:
> return TIER;
> case V4L2_CID_MPEG_VIDEO_HEADER_MODE:
> @@ -175,12 +179,16 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)
> return V4L2_CID_MPEG_VIDEO_VP9_PROFILE;
> case PROFILE_VP8:
> return V4L2_CID_MPEG_VIDEO_VP8_PROFILE;
> + case PROFILE_MPEG2:
> + return V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE;
> case LEVEL_H264:
> return V4L2_CID_MPEG_VIDEO_H264_LEVEL;
> case LEVEL_HEVC:
> return V4L2_CID_MPEG_VIDEO_HEVC_LEVEL;
> case LEVEL_VP9:
> return V4L2_CID_MPEG_VIDEO_VP9_LEVEL;
> + case LEVEL_MPEG2:
> + return V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL;
> case TIER:
> return V4L2_CID_MPEG_VIDEO_HEVC_TIER;
> case HEADER_MODE:
> @@ -527,6 +535,7 @@ int iris_set_stage(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id
> * content also uses a single stage.
> */
> if (inst->is_interlaced ||
> + inst->codec == V4L2_PIX_FMT_MPEG2 ||
> iris_res_is_less_than(width, height, 1280, 720))
> work_mode = STAGE_1;
> }
> @@ -565,6 +574,9 @@ int iris_set_profile(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_
> } else if (inst->codec == V4L2_PIX_FMT_VP8) {
> hfi_id = inst->fw_caps[PROFILE_VP8].hfi_id;
> hfi_value = inst->fw_caps[PROFILE_VP8].value;
> + } else if (inst->codec == V4L2_PIX_FMT_MPEG2) {
> + hfi_id = inst->fw_caps[PROFILE_MPEG2].hfi_id;
> + hfi_value = inst->fw_caps[PROFILE_MPEG2].value;
> } else {
> hfi_id = inst->fw_caps[PROFILE_HEVC].hfi_id;
> hfi_value = inst->fw_caps[PROFILE_HEVC].value;
> @@ -585,6 +597,9 @@ int iris_set_level(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id
> if (inst->codec == V4L2_PIX_FMT_H264) {
> hfi_id = inst->fw_caps[LEVEL_H264].hfi_id;
> hfi_value = inst->fw_caps[LEVEL_H264].value;
> + } else if (inst->codec == V4L2_PIX_FMT_MPEG2) {
> + hfi_id = inst->fw_caps[LEVEL_MPEG2].hfi_id;
> + hfi_value = inst->fw_caps[LEVEL_MPEG2].value;
> } else {
> hfi_id = inst->fw_caps[LEVEL_HEVC].hfi_id;
> hfi_value = inst->fw_caps[LEVEL_HEVC].value;
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c
> index 4c3aa5a03ddd..4b05c2a47b0b 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c
> @@ -41,6 +41,29 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_dec[] = {
> .value = V4L2_MPEG_VIDEO_VP8_PROFILE_0,
> .flags = CAP_FLAG_MENU,
> },
> + {
> + .cap_id = PROFILE_MPEG2,
> + .min = V4L2_MPEG_VIDEO_MPEG2_PROFILE_SIMPLE,
> + .max = V4L2_MPEG_VIDEO_MPEG2_PROFILE_HIGH,
> + .step_or_mask = BIT(V4L2_MPEG_VIDEO_MPEG2_PROFILE_SIMPLE) |
> + BIT(V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN) |
> + BIT(V4L2_MPEG_VIDEO_MPEG2_PROFILE_SNR_SCALABLE) |
> + BIT(V4L2_MPEG_VIDEO_MPEG2_PROFILE_SPATIALLY_SCALABLE) |
> + BIT(V4L2_MPEG_VIDEO_MPEG2_PROFILE_HIGH),
> + .value = V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN,
> + .flags = CAP_FLAG_MENU,
> + },
> + {
> + .cap_id = LEVEL_MPEG2,
> + .min = V4L2_MPEG_VIDEO_MPEG2_LEVEL_LOW,
> + .max = V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH,
> + .step_or_mask = BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_LOW) |
> + BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_MAIN) |
> + BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH_1440) |
> + BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH),
> + .value = V4L2_MPEG_VIDEO_MPEG2_LEVEL_MAIN,
> + .flags = CAP_FLAG_MENU,
> + },
> };
>
> static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = {
> @@ -435,6 +458,7 @@ static const u32 iris_hfi_gen1_dec_fmts[] = {
> V4L2_PIX_FMT_HEVC,
> V4L2_PIX_FMT_VP9,
> V4L2_PIX_FMT_VP8,
> + V4L2_PIX_FMT_MPEG2,
> };
>
> static const u32 iris_hfi_gen1_ar50lt_dec_fmts[] = {
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
> index 90645ed3e0d8..53ba48f88410 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
> @@ -111,6 +111,9 @@ static int iris_hfi_gen1_session_open(struct iris_inst *inst)
> case V4L2_PIX_FMT_VP9:
> codec = HFI_VIDEO_CODEC_VP9;
> break;
> + case V4L2_PIX_FMT_MPEG2:
> + codec = HFI_VIDEO_CODEC_MPEG2;
> + break;
> }
>
> packet.shdr.hdr.size = sizeof(struct hfi_session_open_pkt);
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
> index 13c8ff59d6e4..3c8ae1c82540 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h
> @@ -14,6 +14,7 @@
> #define HFI_SESSION_TYPE_DEC 2
>
> #define HFI_VIDEO_CODEC_H264 0x00000002
> +#define HFI_VIDEO_CODEC_MPEG2 0x00000010
> #define HFI_VIDEO_CODEC_VP8 0x00001000
> #define HFI_VIDEO_CODEC_HEVC 0x00002000
> #define HFI_VIDEO_CODEC_VP9 0x00004000
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
> index 84017b66e98f..3d631effe307 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h
> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
> @@ -116,9 +116,11 @@ enum platform_inst_fw_cap_type {
> PROFILE_HEVC,
> PROFILE_VP9,
> PROFILE_VP8,
> + PROFILE_MPEG2,
> LEVEL_H264,
> LEVEL_HEVC,
> LEVEL_VP9,
> + LEVEL_MPEG2,
> PROFILE_AV1,
> LEVEL_AV1,
> TIER_AV1,
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> index ca90414e6c19..c16e2b652cf4 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.c
> @@ -298,6 +298,11 @@ static u32 hfi_buffer_persist_vp8d(void)
> return ALIGN(VP8_NUM_PROBABILITY_TABLE_BUF * VP8_PROB_TABLE_SIZE, DMA_ALIGNMENT);
> }
>
> +static u32 hfi_buffer_persist_mpeg2d(void)
> +{
> + return QMATRIX_SIZE + MP2D_QPDUMP_SIZE;
> +}
> +
> static u32 hfi_buffer_persist_vp9d_ar50lt(void)
> {
> return ALIGN(VP9_NUM_PROBABILITY_TABLE_BUF * VP9_PROB_TABLE_SIZE, DMA_ALIGNMENT) +
> @@ -1083,6 +1088,8 @@ static u32 iris_vpu_dec_persist_size(struct iris_inst *inst)
> return hfi_buffer_persist_vp9d();
> else if (inst->codec == V4L2_PIX_FMT_VP8)
> return hfi_buffer_persist_vp8d();
> + else if (inst->codec == V4L2_PIX_FMT_MPEG2)
> + return hfi_buffer_persist_mpeg2d();
> else if (inst->codec == V4L2_PIX_FMT_AV1) {
> caps = inst->core->iris_platform_data->inst_caps;
> if (inst->fw_caps[DRAP].value)
> @@ -1163,7 +1170,7 @@ static u32 iris_vpu_dec_line_size(struct iris_inst *inst)
> else if (inst->codec == V4L2_PIX_FMT_VP9)
> return hfi_buffer_line_vp9d(width, height, out_min_count, is_opb,
> num_vpp_pipes);
> - else if (inst->codec == V4L2_PIX_FMT_VP8)
> + else if (inst->codec == V4L2_PIX_FMT_VP8 || inst->codec == V4L2_PIX_FMT_MPEG2)
> return hfi_buffer_line_vp8d(width, height, is_opb, num_vpp_pipes);
> else if (inst->codec == V4L2_PIX_FMT_AV1)
> return hfi_buffer_line_av1d(width, height, is_opb, num_vpp_pipes);
> diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
> index 684b459c0cad..4694467677f6 100644
> --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
> +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h
> @@ -69,6 +69,9 @@ struct iris_inst;
> #define VP8_NUM_PROBABILITY_TABLE_BUF (5 + 1)
> #define VP8_PROB_TABLE_SIZE (3840)
>
> +#define QMATRIX_SIZE (sizeof(u32) * 128 + 256)
> +#define MP2D_QPDUMP_SIZE (115200)
> +
> #define SIZE_SEI_USERDATA 4096
> #define SIZE_DOLBY_RPU_METADATA (41 * 1024)
> #define H264_CABAC_HDR_RATIO_HD_TOT 1
Reviewed-by: Vishnu Reddy <busanna.reddy@xxxxxxxxxxxxxxxx>