[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <17b48dc5-9808-db54-323e-40cb5bbf9b12@oss.qualcomm.com>
Date: Wed, 3 Dec 2025 12:26:34 +0530
From: Dikshita Agarwal <dikshita.agarwal@....qualcomm.com>
To: Wangao Wang <wangao.wang@....qualcomm.com>,
Vikash Garodia <vikash.garodia@....qualcomm.com>,
Abhinav Kumar <abhinav.kumar@...ux.dev>,
Bryan O'Donoghue <bod@...nel.org>,
Mauro Carvalho Chehab <mchehab@...nel.org>
Cc: quic_qiweil@...cinc.com, Renjiang Han <renjiang.han@....qualcomm.com>,
linux-media@...r.kernel.org, linux-arm-msm@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/4] media: qcom: iris: Add Long-Term Reference support
for encoder
On 11/27/2025 1:14 PM, Wangao Wang wrote:
> Add Long-Term Reference(LTR) frame support for both gen1 and gen2
> encoders by enabling the following V4L2 controls:
> V4L2_CID_MPEG_VIDEO_LTR_COUNT
> V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES
> V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX
>
> Key changes:
> Added LTR capability IDs and V4L2 controls.
> Implemented handlers for LTR count, use, and mark (gen1/gen2).
> Defined new HFI properties and structures for LTR.
> Updated platform capability tables and buffer size calculations.
>
> Signed-off-by: Wangao Wang <wangao.wang@....qualcomm.com>
> ---
> drivers/media/platform/qcom/iris/iris_ctrls.c | 126 +++++++++++++++++++++
> drivers/media/platform/qcom/iris/iris_ctrls.h | 5 +
> .../platform/qcom/iris/iris_hfi_gen1_command.c | 25 ++++
> .../platform/qcom/iris/iris_hfi_gen1_defines.h | 24 ++++
> .../platform/qcom/iris/iris_hfi_gen2_defines.h | 3 +
> .../platform/qcom/iris/iris_platform_common.h | 6 +
> .../media/platform/qcom/iris/iris_platform_gen1.c | 30 +++++
> .../media/platform/qcom/iris/iris_platform_gen2.c | 30 +++++
> drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 33 ++++--
> 9 files changed, 270 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c
> index cdf38c285b9133f20bdb9bc3dd0f5e916d3ed7f8..33e104142a5bb51c952550fa45e81b3bdc723ac2 100644
> --- a/drivers/media/platform/qcom/iris/iris_ctrls.c
> +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c
> @@ -108,6 +108,12 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)
> return IR_TYPE;
> case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD:
> return IR_PERIOD;
> + case V4L2_CID_MPEG_VIDEO_LTR_COUNT:
> + return LTR_COUNT;
> + case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES:
> + return USE_LTR;
> + case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX:
> + return MARK_LTR;
> default:
> return INST_FW_CAP_MAX;
> }
> @@ -205,6 +211,12 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)
> return V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE;
> case IR_PERIOD:
> return V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD;
> + case LTR_COUNT:
> + return V4L2_CID_MPEG_VIDEO_LTR_COUNT;
> + case USE_LTR:
> + return V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES;
> + case MARK_LTR:
> + return V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX;
> default:
> return 0;
> }
> @@ -1022,6 +1034,120 @@ int iris_set_ir_period_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_ty
> &ir_period, sizeof(u32));
> }
>
> +int iris_set_ltr_count_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> +{
> + const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + u32 ltr_count = inst->fw_caps[cap_id].value;
> + u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> + struct hfi_ltr_mode ltr_mode;
> +
> + if (!ltr_count)
> + return -EINVAL;
> +
> + ltr_mode.count = ltr_count;
> + ltr_mode.mode = HFI_LTR_MODE_MANUAL;
> + ltr_mode.trust_mode = 1;
> +
> + return hfi_ops->session_set_property(inst, hfi_id,
> + HFI_HOST_FLAGS_NONE,
> + iris_get_port_info(inst, cap_id),
> + HFI_PAYLOAD_STRUCTURE,
> + <r_mode, sizeof(ltr_mode));
> +}
> +
> +int iris_set_use_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> +{
> + const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + struct vb2_queue *sq = v4l2_m2m_get_src_vq(inst->m2m_ctx);
> + struct vb2_queue *dq = v4l2_m2m_get_dst_vq(inst->m2m_ctx);
> + u32 ltr_count = inst->fw_caps[LTR_COUNT].value;
> + u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> + struct hfi_ltr_use ltr_use;
> +
> + if (!vb2_is_streaming(sq) && !vb2_is_streaming(dq))
> + return -EINVAL;
RC check not required here?
> +
> + if (!ltr_count)
> + return -EINVAL;
> +
> + ltr_use.ref_ltr = inst->fw_caps[cap_id].value;
> + ltr_use.use_constrnt = true;
> + ltr_use.frames = 0;
> +
> + return hfi_ops->session_set_property(inst, hfi_id,
> + HFI_HOST_FLAGS_NONE,
> + iris_get_port_info(inst, cap_id),
> + HFI_PAYLOAD_STRUCTURE,
> + <r_use, sizeof(ltr_use));
> +}
> +
> +int iris_set_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> +{
> + const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + struct vb2_queue *sq = v4l2_m2m_get_src_vq(inst->m2m_ctx);
> + struct vb2_queue *dq = v4l2_m2m_get_dst_vq(inst->m2m_ctx);
> + u32 ltr_count = inst->fw_caps[LTR_COUNT].value;
> + u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> + struct hfi_ltr_mark ltr_mark;
> +
> + if (!vb2_is_streaming(sq) && !vb2_is_streaming(dq))
> + return -EINVAL;
> +
> + if (!ltr_count)
> + return -EINVAL;
> +
RC check not required here?
> + ltr_mark.mark_frame = inst->fw_caps[cap_id].value;
> +
> + return hfi_ops->session_set_property(inst, hfi_id,
> + HFI_HOST_FLAGS_NONE,
> + iris_get_port_info(inst, cap_id),
> + HFI_PAYLOAD_STRUCTURE,
> + <r_mark, sizeof(ltr_mark));
> +}
> +
> +int iris_set_ltr_count_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> +{
> + const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + u32 ltr_count = inst->fw_caps[cap_id].value;
> + u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> +
> + if (!ltr_count)
> + return -EINVAL;
> +
> + if (inst->hfi_rc_type == HFI_RATE_CONTROL_VBR_VFR ||
> + inst->hfi_rc_type == HFI_RATE_CONTROL_VBR_CFR ||
> + inst->hfi_rc_type == HFI_RATE_CONTROL_CQ)
> + return -EINVAL;
> +
> + return hfi_ops->session_set_property(inst, hfi_id,
> + HFI_HOST_FLAGS_NONE,
> + iris_get_port_info(inst, cap_id),
> + HFI_PAYLOAD_U32,
> + <r_count, sizeof(u32));
> +}
> +
> +int iris_set_use_and_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> +{
> + const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + u32 ltr_count = inst->fw_caps[LTR_COUNT].value;
> + u32 hfi_val = inst->fw_caps[cap_id].value;
> + u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> +
> + if (!ltr_count || hfi_val == INVALID_DEFAULT_MARK_OR_USE_LTR)
> + return -EINVAL;
> +
> + if (inst->hfi_rc_type == HFI_RATE_CONTROL_VBR_VFR ||
> + inst->hfi_rc_type == HFI_RATE_CONTROL_VBR_CFR ||
> + inst->hfi_rc_type == HFI_RATE_CONTROL_CQ)
> + return -EINVAL;
> +
Streaming check is not required here?
Thanks,
Dikshita
> + return hfi_ops->session_set_property(inst, hfi_id,
> + HFI_HOST_FLAGS_NONE,
> + iris_get_port_info(inst, cap_id),
> + HFI_PAYLOAD_U32,
> + &hfi_val, sizeof(u32));
> +}
> +
Powered by blists - more mailing lists