media: qcom: iris: add dynamic encoder properties
Subsystems (4)
v4 cover media: qcom: iris: add dynamic encoder properties
This patch series introduces several enhancements to the Qualcomm Iris encoder driver, improving support for V4L2 controls and enabling more video encoding features.
- Fix missing hfi_id for gen1 encoder GOP_SIZE cap.
- Add key frame request support for gen1 and gen2 encoders.
All patches have been tested with iris_test_app on gen1:QCS6490, gen2:QCS9100, X1E80100.
---
Changes in v4:
- Add Fixes tag.(bod)
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Correct the max value for FORCE_KEY_FRAME cap.
- Link to v2: https://lore.kernel.org/r/[email protected]
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/[email protected]
---
Wangao Wang (2):
media: qcom: iris: fix missing hfi_id in gen1 GOP_SIZE cap
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: b4515cf4156356e8f4fe6e0fdc17f59adab9772f
change-id: 20260417-dynamic_encode-3751a6360ed4
Best regards,
Signature · 1 line
Wangao Wang <[email protected]>
PATCH v4 1/2 media: qcom: iris: fix missing hfi_id in gen1 GOP_SIZE cap
Add hfi_id to gen1 encoder GOP_SIZE cap and replace the set function, remove the redundant INTRA_PERIOD cap.
--- 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(-)
drivers/media/platform/qcom/iris/iris_ctrls.c +1 -1
@@ -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;
drivers/media/platform/qcom/iris/iris_hfi_gen1.c +4 -12
@@ -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,
drivers/media/platform/qcom/iris/iris_platform_common.h +0 -1
@@ -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,
Signature · 1 line
2.43.0
Re: [PATCH v4 1/2] media: qcom: iris: fix missing hfi_id in gen1 GOP_SIZE cap
Quoted 5 lines · Wangao Wang
Add
hfi_idto gen1 encoderGOP_SIZEcap and replace the set function, remove the redundantINTRA_PERIODcap.Fixes d22037f3fd33 ("media: iris: Set platform capabilities to firmware for encoder video device")
Quoted 7 lines
Reviewed-by Vishnu Reddy<[email protected]>Signed-off-by Wangao Wang<[email protected]>--- 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(-)
PATCH v4 2/2 media: qcom: iris: Add request key frame support for encoder
In reply to Wangao WangAdd request key frame support for both gen1 and gen2 encoders by enabling
V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.
--- 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(-)
drivers/media/platform/qcom/iris/iris_ctrls.c +22 -0
@@ -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;
drivers/media/platform/qcom/iris/iris_ctrls.h +1 -0
@@ -47,6 +47,7 @@ int iris_set_layer_type(struct iris_inst *inst, enum platform_inst_fw_cap_type cint 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
drivers/media/platform/qcom/iris/iris_hfi_gen1.c +10 -0
@@ -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[] = {
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +3 -0
@@ -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 ; }
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +1 -0
@@ -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
drivers/media/platform/qcom/iris/iris_hfi_gen2.c +11 -1
@@ -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[] = {
drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +7 -0
@@ -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
drivers/media/platform/qcom/iris/iris_platform_common.h +1 -0
@@ -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, };
Signature · 1 line
2.43.0
Re: [PATCH v4 2/2] media: qcom: iris: Add request key frame support for encoder
Quoted 7 lines · Wangao Wang
Add request key frame support for both gen1 and gen2 encoders by enabling
V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME.Reviewed-by Bryan O'Donoghue<[email protected]>Reviewed-by Vishnu Reddy<[email protected]>Signed-off-by Wangao Wang<[email protected]>
Quoted 10 lines
--- 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(-)