* [PATCH v3 0/2] media: qcom: iris: add dynamic encoder properties @ 2026-06-24 8:51 ` Wangao Wang 2026-06-24 8:51 ` [PATCH v3 1/2] media: qcom: iris: improve gop size support for gen1 encoder Wangao Wang ` (2 more replies) 0 siblings, 3 replies; 8+ messages in thread From: Wangao Wang @ 2026-06-24 8:51 UTC (permalink / raw) To: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue, Mauro Carvalho Chehab Cc: quic_qiweil, Renjiang Han, linux-media, linux-arm-msm, linux-kernel, Wangao Wang This patch series introduces several enhancements to the Qualcomm Iris encoder driver, improving support for V4L2 controls and enabling more video encoding features. All patches have been tested with iris_test_app on gen1:QCS6490, gen2:QCS9100, X1E80100. Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com> --- Changes in v3: - Correct the max value for FORCE_KEY_FRAME cap. - Link to v2: https://lore.kernel.org/r/20260604-dynamic_encode-v2-0-6e97df032482@oss.qualcomm.com Changes in v2: - Rebased due to a conflict with commit 'media: qcom: iris: split HFI session ops from core ops' (35da0884068226ca3a53371dbf685db6e0d74658). - Link to v1: https://lore.kernel.org/r/20260429-dynamic_encode-v1-0-c9fb691d8b3a@oss.qualcomm.com --- Wangao Wang (2): media: qcom: iris: improve gop size support for gen1 encoder media: qcom: iris: Add request key frame support for encoder drivers/media/platform/qcom/iris/iris_ctrls.c | 24 +++++++++++++++++++- drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + drivers/media/platform/qcom/iris/iris_hfi_gen1.c | 26 ++++++++++++---------- .../platform/qcom/iris/iris_hfi_gen1_command.c | 3 +++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 1 + drivers/media/platform/qcom/iris/iris_hfi_gen2.c | 12 +++++++++- .../platform/qcom/iris/iris_hfi_gen2_defines.h | 7 ++++++ .../platform/qcom/iris/iris_platform_common.h | 2 +- 8 files changed, 61 insertions(+), 15 deletions(-) --- base-commit: 4e5dfb7c84012007c3c7061126491bbc92d71bf1 change-id: 20260417-dynamic_encode-3751a6360ed4 Best regards, -- Wangao Wang <wangao.wang@oss.qualcomm.com> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 1/2] media: qcom: iris: improve gop size support for gen1 encoder 2026-06-24 8:51 ` [PATCH v3 0/2] media: qcom: iris: add dynamic encoder properties Wangao Wang @ 2026-06-24 8:51 ` Wangao Wang 2026-06-30 15:06 ` Vishnu Reddy 2026-06-30 22:10 ` Bryan O'Donoghue 2026-06-24 8:51 ` [PATCH v3 2/2] media: qcom: iris: Add request key frame support for encoder Wangao Wang 2026-06-30 22:07 ` [PATCH v3 0/2] media: qcom: iris: add dynamic encoder properties Bryan O'Donoghue 2 siblings, 2 replies; 8+ messages in thread From: Wangao Wang @ 2026-06-24 8:51 UTC (permalink / raw) To: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue, Mauro Carvalho Chehab Cc: quic_qiweil, Renjiang Han, linux-media, linux-arm-msm, linux-kernel, Wangao Wang The GOP_SIZE cap was missing an hfi_id, so it would not interact with the firmware but could still save the parameter passed by the client. INTRA_PERIOD was acting as GOP_SIZE here. The code was redundant, so the two caps have been merged. Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com> --- drivers/media/platform/qcom/iris/iris_ctrls.c | 2 +- drivers/media/platform/qcom/iris/iris_hfi_gen1.c | 16 ++++------------ drivers/media/platform/qcom/iris/iris_platform_common.h | 1 - 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c index 10e33b8a73f60759c4f1cb17b5c95897f0e1468f..391e1fc5f6e2ec8e9cf5ba4e0f76b2d1da3e2a35 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -1293,7 +1293,7 @@ int iris_set_use_and_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_ int iris_set_intra_period(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) { const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; - u32 gop_size = inst->fw_caps[GOP_SIZE].value; + u32 gop_size = inst->fw_caps[cap_id].value; u32 b_frame = inst->fw_caps[B_FRAME].value; u32 hfi_id = inst->fw_caps[cap_id].hfi_id; struct hfi_intra_period intra_period; diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c index ca1545d28b5310d8c45a905287dcb69f6184d9cc..eff9216bb50143c0d752051a6400605bbaf3803e 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c @@ -171,7 +171,9 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .max = (1 << 16) - 1, .step_or_mask = 1, .value = 30, - .set = iris_set_u32 + .hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_intra_period, }, { .cap_id = ENTROPY_MODE, @@ -240,7 +242,7 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .step_or_mask = 1, .value = 0, .hfi_id = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH, - .flags = CAP_FLAG_OUTPUT_PORT, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_ir_period_gen1, }, { @@ -281,16 +283,6 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .value = 0, .flags = CAP_FLAG_OUTPUT_PORT, }, - { - .cap_id = INTRA_PERIOD, - .min = 0, - .max = 1, - .step_or_mask = 1, - .value = 0, - .hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, - .flags = CAP_FLAG_OUTPUT_PORT, - .set = iris_set_intra_period, - }, { .cap_id = LAYER_ENABLE, .min = 0, diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h index c9256f2323dc4521f9eacaeffb0fc08a180de3ff..ff48333ad089894c3393e8ad45903c2603288eb9 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -165,7 +165,6 @@ enum platform_inst_fw_cap_type { USE_LTR, MARK_LTR, B_FRAME, - INTRA_PERIOD, LAYER_ENABLE, LAYER_TYPE_H264, LAYER_TYPE_HEVC, -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/2] media: qcom: iris: improve gop size support for gen1 encoder 2026-06-24 8:51 ` [PATCH v3 1/2] media: qcom: iris: improve gop size support for gen1 encoder Wangao Wang @ 2026-06-30 15:06 ` Vishnu Reddy 2026-06-30 22:10 ` Bryan O'Donoghue 1 sibling, 0 replies; 8+ messages in thread From: Vishnu Reddy @ 2026-06-30 15:06 UTC (permalink / raw) To: Wangao Wang, Vikash Garodia, Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue, Mauro Carvalho Chehab Cc: quic_qiweil, Renjiang Han, linux-media, linux-arm-msm, linux-kernel On 6/24/2026 2:21 PM, Wangao Wang wrote: > The GOP_SIZE cap was missing an hfi_id, so it would not interact with the > firmware but could still save the parameter passed by the client. > INTRA_PERIOD was acting as GOP_SIZE here. The code was redundant, so the > two caps have been merged. > > Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com> > --- > drivers/media/platform/qcom/iris/iris_ctrls.c | 2 +- > drivers/media/platform/qcom/iris/iris_hfi_gen1.c | 16 ++++------------ > drivers/media/platform/qcom/iris/iris_platform_common.h | 1 - > 3 files changed, 5 insertions(+), 14 deletions(-) > > diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c > index 10e33b8a73f60759c4f1cb17b5c95897f0e1468f..391e1fc5f6e2ec8e9cf5ba4e0f76b2d1da3e2a35 100644 > --- a/drivers/media/platform/qcom/iris/iris_ctrls.c > +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c > @@ -1293,7 +1293,7 @@ int iris_set_use_and_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_ > int iris_set_intra_period(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) > { > const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; > - u32 gop_size = inst->fw_caps[GOP_SIZE].value; > + u32 gop_size = inst->fw_caps[cap_id].value; > u32 b_frame = inst->fw_caps[B_FRAME].value; > u32 hfi_id = inst->fw_caps[cap_id].hfi_id; > struct hfi_intra_period intra_period; > diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c > index ca1545d28b5310d8c45a905287dcb69f6184d9cc..eff9216bb50143c0d752051a6400605bbaf3803e 100644 > --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c > +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c > @@ -171,7 +171,9 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { > .max = (1 << 16) - 1, > .step_or_mask = 1, > .value = 30, > - .set = iris_set_u32 > + .hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, > + .flags = CAP_FLAG_OUTPUT_PORT, > + .set = iris_set_intra_period, > }, > { > .cap_id = ENTROPY_MODE, > @@ -240,7 +242,7 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { > .step_or_mask = 1, > .value = 0, > .hfi_id = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH, > - .flags = CAP_FLAG_OUTPUT_PORT, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, > .set = iris_set_ir_period_gen1, > }, > { > @@ -281,16 +283,6 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { > .value = 0, > .flags = CAP_FLAG_OUTPUT_PORT, > }, > - { > - .cap_id = INTRA_PERIOD, > - .min = 0, > - .max = 1, > - .step_or_mask = 1, > - .value = 0, > - .hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, > - .flags = CAP_FLAG_OUTPUT_PORT, > - .set = iris_set_intra_period, > - }, > { > .cap_id = LAYER_ENABLE, > .min = 0, > diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h > index c9256f2323dc4521f9eacaeffb0fc08a180de3ff..ff48333ad089894c3393e8ad45903c2603288eb9 100644 > --- a/drivers/media/platform/qcom/iris/iris_platform_common.h > +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h > @@ -165,7 +165,6 @@ enum platform_inst_fw_cap_type { > USE_LTR, > MARK_LTR, > B_FRAME, > - INTRA_PERIOD, > LAYER_ENABLE, > LAYER_TYPE_H264, > LAYER_TYPE_HEVC, Reviewed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/2] media: qcom: iris: improve gop size support for gen1 encoder 2026-06-24 8:51 ` [PATCH v3 1/2] media: qcom: iris: improve gop size support for gen1 encoder Wangao Wang 2026-06-30 15:06 ` Vishnu Reddy @ 2026-06-30 22:10 ` Bryan O'Donoghue 1 sibling, 0 replies; 8+ messages in thread From: Bryan O'Donoghue @ 2026-06-30 22:10 UTC (permalink / raw) To: Wangao Wang, Vikash Garodia, Dikshita Agarwal, Abhinav Kumar, Mauro Carvalho Chehab Cc: quic_qiweil, Renjiang Han, linux-media, linux-arm-msm, linux-kernel On 24/06/2026 09:51, Wangao Wang wrote: > The GOP_SIZE cap was missing an hfi_id, so it would not interact with the > firmware but could still save the parameter passed by the client. > INTRA_PERIOD was acting as GOP_SIZE here. The code was redundant, so the > two caps have been merged. Hmm, this really feels like a bug fix. Your first sentence describes a software flaw, which you then remediate. I'd like to see a better description of that - you appear to be saying "but it doesn't matter anyway" - which is perhaps true but still to me feels like you need to actively justify why this _shouldn't_ go back to stable. > Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com> > --- > drivers/media/platform/qcom/iris/iris_ctrls.c | 2 +- > drivers/media/platform/qcom/iris/iris_hfi_gen1.c | 16 ++++------------ > drivers/media/platform/qcom/iris/iris_platform_common.h | 1 - > 3 files changed, 5 insertions(+), 14 deletions(-) > > diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c > index 10e33b8a73f60759c4f1cb17b5c95897f0e1468f..391e1fc5f6e2ec8e9cf5ba4e0f76b2d1da3e2a35 100644 > --- a/drivers/media/platform/qcom/iris/iris_ctrls.c > +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c > @@ -1293,7 +1293,7 @@ int iris_set_use_and_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_ > int iris_set_intra_period(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) > { > const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; > - u32 gop_size = inst->fw_caps[GOP_SIZE].value; > + u32 gop_size = inst->fw_caps[cap_id].value; > u32 b_frame = inst->fw_caps[B_FRAME].value; > u32 hfi_id = inst->fw_caps[cap_id].hfi_id; > struct hfi_intra_period intra_period; > diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c > index ca1545d28b5310d8c45a905287dcb69f6184d9cc..eff9216bb50143c0d752051a6400605bbaf3803e 100644 > --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c > +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c > @@ -171,7 +171,9 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { > .max = (1 << 16) - 1, > .step_or_mask = 1, > .value = 30, > - .set = iris_set_u32 > + .hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, > + .flags = CAP_FLAG_OUTPUT_PORT, > + .set = iris_set_intra_period, > }, > { > .cap_id = ENTROPY_MODE, > @@ -240,7 +242,7 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { > .step_or_mask = 1, > .value = 0, > .hfi_id = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH, > - .flags = CAP_FLAG_OUTPUT_PORT, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, > .set = iris_set_ir_period_gen1, > }, > { > @@ -281,16 +283,6 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { > .value = 0, > .flags = CAP_FLAG_OUTPUT_PORT, > }, > - { > - .cap_id = INTRA_PERIOD, > - .min = 0, > - .max = 1, > - .step_or_mask = 1, > - .value = 0, > - .hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, > - .flags = CAP_FLAG_OUTPUT_PORT, > - .set = iris_set_intra_period, > - }, > { > .cap_id = LAYER_ENABLE, > .min = 0, > diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h > index c9256f2323dc4521f9eacaeffb0fc08a180de3ff..ff48333ad089894c3393e8ad45903c2603288eb9 100644 > --- a/drivers/media/platform/qcom/iris/iris_platform_common.h > +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h > @@ -165,7 +165,6 @@ enum platform_inst_fw_cap_type { > USE_LTR, > MARK_LTR, > B_FRAME, > - INTRA_PERIOD, > LAYER_ENABLE, > LAYER_TYPE_H264, > LAYER_TYPE_HEVC, > > -- > 2.43.0 > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 2/2] media: qcom: iris: Add request key frame support for encoder 2026-06-24 8:51 ` [PATCH v3 0/2] media: qcom: iris: add dynamic encoder properties Wangao Wang 2026-06-24 8:51 ` [PATCH v3 1/2] media: qcom: iris: improve gop size support for gen1 encoder Wangao Wang @ 2026-06-24 8:51 ` Wangao Wang 2026-06-30 15:10 ` Vishnu Reddy 2026-06-30 22:12 ` Bryan O'Donoghue 2026-06-30 22:07 ` [PATCH v3 0/2] media: qcom: iris: add dynamic encoder properties Bryan O'Donoghue 2 siblings, 2 replies; 8+ messages in thread From: Wangao Wang @ 2026-06-24 8:51 UTC (permalink / raw) To: Vikash Garodia, Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue, Mauro Carvalho Chehab Cc: quic_qiweil, Renjiang Han, linux-media, linux-arm-msm, linux-kernel, Wangao Wang Add request key frame support for both gen1 and gen2 encoders by enabling V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME. Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com> --- drivers/media/platform/qcom/iris/iris_ctrls.c | 22 ++++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + drivers/media/platform/qcom/iris/iris_hfi_gen1.c | 10 ++++++++++ .../platform/qcom/iris/iris_hfi_gen1_command.c | 3 +++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 1 + drivers/media/platform/qcom/iris/iris_hfi_gen2.c | 12 +++++++++++- .../platform/qcom/iris/iris_hfi_gen2_defines.h | 7 +++++++ .../platform/qcom/iris/iris_platform_common.h | 1 + 8 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 391e1fc5f6e2ec8e9cf5ba4e0f76b2d1da3e2a35..2918a7df0b403a886648e90ec00968f51c4660a0 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -154,6 +154,8 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id) return LAYER4_BITRATE_HEVC; case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR: return LAYER5_BITRATE_HEVC; + case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME: + return REQUEST_SYNC_FRAME; default: return INST_FW_CAP_MAX; } @@ -297,6 +299,8 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id) return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_BR; case LAYER5_BITRATE_HEVC: return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR; + case REQUEST_SYNC_FRAME: + return V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME; default: return 0; } @@ -1477,6 +1481,24 @@ int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_typ &bitrate, sizeof(u32)); } +int iris_set_req_sync_frame(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) +{ + const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; + u32 hfi_id = inst->fw_caps[cap_id].hfi_id; + u32 hfi_val = 0; + + if (inst->fw_caps[PREPEND_SPSPPS_TO_IDR].value) + hfi_val = HFI_SYNC_FRAME_REQUEST_WITH_PREFIX_SEQ_HDR; + else + hfi_val = HFI_SYNC_FRAME_REQUEST_WITHOUT_SEQ_HDR; + + return hfi_ops->session_set_property(inst, hfi_id, + HFI_HOST_FLAGS_NONE, + iris_get_port_info(inst, cap_id), + HFI_PAYLOAD_U32_ENUM, + &hfi_val, sizeof(u32)); +} + int iris_set_properties(struct iris_inst *inst, u32 plane) { const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.h b/drivers/media/platform/qcom/iris/iris_ctrls.h index 3c462ec9190be8935176b290588f224fe4f144a4..8d8bbef960076c08e5af0f65920dde187f24a313 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.h +++ b/drivers/media/platform/qcom/iris/iris_ctrls.h @@ -47,6 +47,7 @@ int iris_set_layer_type(struct iris_inst *inst, enum platform_inst_fw_cap_type c int iris_set_layer_count_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_layer_count_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); +int iris_set_req_sync_frame(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_properties(struct iris_inst *inst, u32 plane); #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c index eff9216bb50143c0d752051a6400605bbaf3803e..0f7e7d6b25f41eb8a67a9a8f01dce20ea54dc335 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c @@ -375,6 +375,16 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_bitrate_gen1, }, + { + .cap_id = REQUEST_SYNC_FRAME, + .min = 0, + .max = 1, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_CONFIG_VENC_REQUEST_SYNC_FRAME, + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_req_sync_frame, + }, }; static const u32 sm8250_vdec_input_config_param_default[] = { 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 7674b47ad6c49adfaf16b444c8ec7295b230a529..d7fd867cf6c98523123e9205fcfe4b469708da72 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c @@ -741,6 +741,9 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p packet->shdr.hdr.size += sizeof(u32); break; } + case HFI_PROPERTY_CONFIG_VENC_REQUEST_SYNC_FRAME: { + break; + } default: return -EINVAL; } 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 0e4dee19238464a9671a94eaab8eeda2d7f7ca9f..275f3fea3d2aabe26a2a0498c78c09ec28765b24 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h @@ -157,6 +157,7 @@ #define HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER 0x2005026 #define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001 #define HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD 0x2006003 +#define HFI_PROPERTY_CONFIG_VENC_REQUEST_SYNC_FRAME 0x2006004 #define HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME 0x2006009 #define HFI_PROPERTY_CONFIG_VENC_USELTRFRAME 0x200600a #define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008 diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c index acc0ed8adda1ae726c94ab6346b0b4b2b3db1d7b..7d6fde36f0e9036145e45b84054b439536b25e50 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c @@ -937,7 +937,17 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_layer_bitrate, - } + }, + { + .cap_id = REQUEST_SYNC_FRAME, + .min = 0, + .max = 1, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROP_REQUEST_SYNC_FRAME, + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_req_sync_frame, + }, }; static const u32 sm8550_vdec_input_config_params_default[] = { diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h index 776b21cd11b2cd5555cbced8e438cb32e87a539c..a8b47e4ceba0fc868125f841a5635476571aab85 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h @@ -90,6 +90,13 @@ enum hfi_layer_encoding_type { #define HFI_PROP_BITRATE_LAYER4 0x0300013f #define HFI_PROP_BITRATE_LAYER5 0x03000140 #define HFI_PROP_BITRATE_LAYER6 0x03000141 + +enum hfi_syncframe_request_mode { + HFI_SYNC_FRAME_REQUEST_WITHOUT_SEQ_HDR = 0x00000001, + HFI_SYNC_FRAME_REQUEST_WITH_PREFIX_SEQ_HDR = 0x00000002, +}; + +#define HFI_PROP_REQUEST_SYNC_FRAME 0x03000145 #define HFI_PROP_MAX_GOP_FRAMES 0x03000146 #define HFI_PROP_MAX_B_FRAMES 0x03000147 #define HFI_PROP_QUALITY_MODE 0x03000148 diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h index ff48333ad089894c3393e8ad45903c2603288eb9..23b6e7676d05bd01725f8e2cfca47b06ef112c27 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -182,6 +182,7 @@ enum platform_inst_fw_cap_type { LAYER3_BITRATE_HEVC, LAYER4_BITRATE_HEVC, LAYER5_BITRATE_HEVC, + REQUEST_SYNC_FRAME, INST_FW_CAP_MAX, }; -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/2] media: qcom: iris: Add request key frame support for encoder 2026-06-24 8:51 ` [PATCH v3 2/2] media: qcom: iris: Add request key frame support for encoder Wangao Wang @ 2026-06-30 15:10 ` Vishnu Reddy 2026-06-30 22:12 ` Bryan O'Donoghue 1 sibling, 0 replies; 8+ messages in thread From: Vishnu Reddy @ 2026-06-30 15:10 UTC (permalink / raw) To: Wangao Wang, Vikash Garodia, Dikshita Agarwal, Abhinav Kumar, Bryan O'Donoghue, Mauro Carvalho Chehab Cc: quic_qiweil, Renjiang Han, linux-media, linux-arm-msm, linux-kernel On 6/24/2026 2:21 PM, Wangao Wang wrote: > Add request key frame support for both gen1 and gen2 encoders by enabling > > V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME. > > Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com> > --- > drivers/media/platform/qcom/iris/iris_ctrls.c | 22 ++++++++++++++++++++++ > drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + > drivers/media/platform/qcom/iris/iris_hfi_gen1.c | 10 ++++++++++ > .../platform/qcom/iris/iris_hfi_gen1_command.c | 3 +++ > .../platform/qcom/iris/iris_hfi_gen1_defines.h | 1 + > drivers/media/platform/qcom/iris/iris_hfi_gen2.c | 12 +++++++++++- > .../platform/qcom/iris/iris_hfi_gen2_defines.h | 7 +++++++ > .../platform/qcom/iris/iris_platform_common.h | 1 + > 8 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 391e1fc5f6e2ec8e9cf5ba4e0f76b2d1da3e2a35..2918a7df0b403a886648e90ec00968f51c4660a0 100644 > --- a/drivers/media/platform/qcom/iris/iris_ctrls.c > +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c > @@ -154,6 +154,8 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id) > return LAYER4_BITRATE_HEVC; > case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR: > return LAYER5_BITRATE_HEVC; > + case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME: > + return REQUEST_SYNC_FRAME; > default: > return INST_FW_CAP_MAX; > } > @@ -297,6 +299,8 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id) > return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_BR; > case LAYER5_BITRATE_HEVC: > return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR; > + case REQUEST_SYNC_FRAME: > + return V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME; > default: > return 0; > } > @@ -1477,6 +1481,24 @@ int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_typ > &bitrate, sizeof(u32)); > } > > +int iris_set_req_sync_frame(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) > +{ > + const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; > + u32 hfi_id = inst->fw_caps[cap_id].hfi_id; > + u32 hfi_val = 0; > + > + if (inst->fw_caps[PREPEND_SPSPPS_TO_IDR].value) > + hfi_val = HFI_SYNC_FRAME_REQUEST_WITH_PREFIX_SEQ_HDR; > + else > + hfi_val = HFI_SYNC_FRAME_REQUEST_WITHOUT_SEQ_HDR; > + > + return hfi_ops->session_set_property(inst, hfi_id, > + HFI_HOST_FLAGS_NONE, > + iris_get_port_info(inst, cap_id), > + HFI_PAYLOAD_U32_ENUM, > + &hfi_val, sizeof(u32)); > +} > + > int iris_set_properties(struct iris_inst *inst, u32 plane) > { > const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; > diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.h b/drivers/media/platform/qcom/iris/iris_ctrls.h > index 3c462ec9190be8935176b290588f224fe4f144a4..8d8bbef960076c08e5af0f65920dde187f24a313 100644 > --- a/drivers/media/platform/qcom/iris/iris_ctrls.h > +++ b/drivers/media/platform/qcom/iris/iris_ctrls.h > @@ -47,6 +47,7 @@ int iris_set_layer_type(struct iris_inst *inst, enum platform_inst_fw_cap_type c > int iris_set_layer_count_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); > int iris_set_layer_count_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); > int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); > +int iris_set_req_sync_frame(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); > int iris_set_properties(struct iris_inst *inst, u32 plane); > > #endif > diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c > index eff9216bb50143c0d752051a6400605bbaf3803e..0f7e7d6b25f41eb8a67a9a8f01dce20ea54dc335 100644 > --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c > +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c > @@ -375,6 +375,16 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { > CAP_FLAG_DYNAMIC_ALLOWED, > .set = iris_set_bitrate_gen1, > }, > + { > + .cap_id = REQUEST_SYNC_FRAME, > + .min = 0, > + .max = 1, > + .step_or_mask = 1, > + .value = 0, > + .hfi_id = HFI_PROPERTY_CONFIG_VENC_REQUEST_SYNC_FRAME, > + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, > + .set = iris_set_req_sync_frame, > + }, > }; > > static const u32 sm8250_vdec_input_config_param_default[] = { > 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 7674b47ad6c49adfaf16b444c8ec7295b230a529..d7fd867cf6c98523123e9205fcfe4b469708da72 100644 > --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c > +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c > @@ -741,6 +741,9 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p > packet->shdr.hdr.size += sizeof(u32); > break; > } > + case HFI_PROPERTY_CONFIG_VENC_REQUEST_SYNC_FRAME: { > + break; > + } > default: > return -EINVAL; > } > 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 0e4dee19238464a9671a94eaab8eeda2d7f7ca9f..275f3fea3d2aabe26a2a0498c78c09ec28765b24 100644 > --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h > +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h > @@ -157,6 +157,7 @@ > #define HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER 0x2005026 > #define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001 > #define HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD 0x2006003 > +#define HFI_PROPERTY_CONFIG_VENC_REQUEST_SYNC_FRAME 0x2006004 > #define HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME 0x2006009 > #define HFI_PROPERTY_CONFIG_VENC_USELTRFRAME 0x200600a > #define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008 > diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c > index acc0ed8adda1ae726c94ab6346b0b4b2b3db1d7b..7d6fde36f0e9036145e45b84054b439536b25e50 100644 > --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c > +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c > @@ -937,7 +937,17 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { > .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > CAP_FLAG_DYNAMIC_ALLOWED, > .set = iris_set_layer_bitrate, > - } > + }, > + { > + .cap_id = REQUEST_SYNC_FRAME, > + .min = 0, > + .max = 1, > + .step_or_mask = 1, > + .value = 0, > + .hfi_id = HFI_PROP_REQUEST_SYNC_FRAME, > + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, > + .set = iris_set_req_sync_frame, > + }, > }; > > static const u32 sm8550_vdec_input_config_params_default[] = { > diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h > index 776b21cd11b2cd5555cbced8e438cb32e87a539c..a8b47e4ceba0fc868125f841a5635476571aab85 100644 > --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h > +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h > @@ -90,6 +90,13 @@ enum hfi_layer_encoding_type { > #define HFI_PROP_BITRATE_LAYER4 0x0300013f > #define HFI_PROP_BITRATE_LAYER5 0x03000140 > #define HFI_PROP_BITRATE_LAYER6 0x03000141 > + > +enum hfi_syncframe_request_mode { > + HFI_SYNC_FRAME_REQUEST_WITHOUT_SEQ_HDR = 0x00000001, > + HFI_SYNC_FRAME_REQUEST_WITH_PREFIX_SEQ_HDR = 0x00000002, > +}; > + > +#define HFI_PROP_REQUEST_SYNC_FRAME 0x03000145 > #define HFI_PROP_MAX_GOP_FRAMES 0x03000146 > #define HFI_PROP_MAX_B_FRAMES 0x03000147 > #define HFI_PROP_QUALITY_MODE 0x03000148 > diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h > index ff48333ad089894c3393e8ad45903c2603288eb9..23b6e7676d05bd01725f8e2cfca47b06ef112c27 100644 > --- a/drivers/media/platform/qcom/iris/iris_platform_common.h > +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h > @@ -182,6 +182,7 @@ enum platform_inst_fw_cap_type { > LAYER3_BITRATE_HEVC, > LAYER4_BITRATE_HEVC, > LAYER5_BITRATE_HEVC, > + REQUEST_SYNC_FRAME, > INST_FW_CAP_MAX, > }; > Reviewed-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/2] media: qcom: iris: Add request key frame support for encoder 2026-06-24 8:51 ` [PATCH v3 2/2] media: qcom: iris: Add request key frame support for encoder Wangao Wang 2026-06-30 15:10 ` Vishnu Reddy @ 2026-06-30 22:12 ` Bryan O'Donoghue 1 sibling, 0 replies; 8+ messages in thread From: Bryan O'Donoghue @ 2026-06-30 22:12 UTC (permalink / raw) To: Wangao Wang, Vikash Garodia, Dikshita Agarwal, Abhinav Kumar, Mauro Carvalho Chehab Cc: quic_qiweil, Renjiang Han, linux-media, linux-arm-msm, linux-kernel On 24/06/2026 09:51, Wangao Wang wrote: > Add request key frame support for both gen1 and gen2 encoders by enabling > > V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME. > > Signed-off-by: Wangao Wang<wangao.wang@oss.qualcomm.com> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- bod ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 0/2] media: qcom: iris: add dynamic encoder properties 2026-06-24 8:51 ` [PATCH v3 0/2] media: qcom: iris: add dynamic encoder properties Wangao Wang 2026-06-24 8:51 ` [PATCH v3 1/2] media: qcom: iris: improve gop size support for gen1 encoder Wangao Wang 2026-06-24 8:51 ` [PATCH v3 2/2] media: qcom: iris: Add request key frame support for encoder Wangao Wang @ 2026-06-30 22:07 ` Bryan O'Donoghue 2 siblings, 0 replies; 8+ messages in thread From: Bryan O'Donoghue @ 2026-06-30 22:07 UTC (permalink / raw) To: Wangao Wang, Vikash Garodia, Dikshita Agarwal, Abhinav Kumar, Mauro Carvalho Chehab Cc: quic_qiweil, Renjiang Han, linux-media, linux-arm-msm, linux-kernel On 24/06/2026 09:51, Wangao Wang wrote: > This patch series introduces several enhancements to the Qualcomm Iris > encoder driver, improving support for V4L2 controls and enabling more > video encoding features. For future reference a bit more specificity in the overview would be nice "improving controls and enabling more video encoding features" is quite vague. > All patches have been tested with iris_test_app on gen1:QCS6490, > gen2:QCS9100, X1E80100. ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2026-06-30 22:13 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <Z3W2-J864HyF-sbnVW8bg7mP4rdQ-AGsEM_jIIXZEEzjrC0E2wQSfGS3CXZItedQtyxy_aMWtLQmg-iyFEcHpA==@protonmail.internalid>
2026-06-24 8:51 ` [PATCH v3 0/2] media: qcom: iris: add dynamic encoder properties Wangao Wang
2026-06-24 8:51 ` [PATCH v3 1/2] media: qcom: iris: improve gop size support for gen1 encoder Wangao Wang
2026-06-30 15:06 ` Vishnu Reddy
2026-06-30 22:10 ` Bryan O'Donoghue
2026-06-24 8:51 ` [PATCH v3 2/2] media: qcom: iris: Add request key frame support for encoder Wangao Wang
2026-06-30 15:10 ` Vishnu Reddy
2026-06-30 22:12 ` Bryan O'Donoghue
2026-06-30 22:07 ` [PATCH v3 0/2] media: qcom: iris: add dynamic encoder properties Bryan O'Donoghue
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox