media: qcom: iris: add dynamic encoder properties
Subsystems (4)
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.
All patches have been tested with iris_test_app on gen1:QCS6490, gen2:QCS9100, X1E80100.
Dependencies:
https://lore.kernel.org/r/20260206-batch2_iris_encoder_enhancements-v5-0-fb75ed8fa375@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 + .../platform/qcom/iris/iris_hfi_gen1_command.c | 3 +++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 1 + .../platform/qcom/iris/iris_hfi_gen2_defines.h | 7 +++++++ .../platform/qcom/iris/iris_platform_common.h | 2 +- .../media/platform/qcom/iris/iris_platform_gen1.c | 24 ++++++++++++---------- .../media/platform/qcom/iris/iris_platform_gen2.c | 12 ++++++++++- 8 files changed, 60 insertions(+), 14 deletions(-)
---
base-commit: 9974969c14031a097d6b45bcb7a06bb4aa525c40
change-id: 20260417-dynamic_encode-3751a6360ed4
prerequisite-change-id: 20251125-batch2_iris_encoder_enhancements-3e5c42b93a25:v6
prerequisite-patch-id: c9ccf4a76f11e6a385b73ce57756cc28f41da39b
prerequisite-patch-id: 8e53eaa34bb8bb14bdca585a3cf0711894215f92
prerequisite-patch-id: a28ff466ff4e74ab15a0b390396fc33f58eeff60
prerequisite-patch-id: 797ee4bf266018dafe983091de197ff7009d262d
prerequisite-patch-id: e72c6f5a9a1d8f238cdf72c29551994110e1ba29
prerequisite-patch-id: e01a909f0bf3ffe830ea58e67fae23def4a65c0e
Best regards,
Signature · 1 line
Wangao Wang <[email protected]>
PATCH 1/2 media: qcom: iris: improve gop size support for gen1 encoder
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.
--- drivers/media/platform/qcom/iris/iris_ctrls.c | 2 +- drivers/media/platform/qcom/iris/iris_platform_common.h | 1 - drivers/media/platform/qcom/iris/iris_platform_gen1.c | 14 +++----------- 3 files changed, 4 insertions(+), 13 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_command_ops *hfi_ops = inst->core->hfi_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_platform_common.h +0 -1
@@ -172,7 +172,6 @@ enum platform_inst_fw_cap_type {USE_LTR ,MARK_LTR ,B_FRAME , -INTRA_PERIOD ,LAYER_ENABLE ,LAYER_TYPE_H264 , LAYER_TYPE_HEVC,
drivers/media/platform/qcom/iris/iris_platform_gen1.c +3 -11
@@ -193,7 +193,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,
@@ -303,16 +305,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,
Signature · 1 line
2.43.0
PATCH 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 + .../platform/qcom/iris/iris_hfi_gen1_command.c | 3 +++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 1 + .../platform/qcom/iris/iris_hfi_gen2_defines.h | 7 +++++++ .../platform/qcom/iris/iris_platform_common.h | 1 + .../media/platform/qcom/iris/iris_platform_gen1.c | 10 ++++++++++ .../media/platform/qcom/iris/iris_platform_gen2.c | 12 +++++++++++- 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_command_ops *hfi_ops = inst->core->hfi_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_command_ops *hfi_ops = inst->core->hfi_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_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_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
@@ -189,6 +189,7 @@ enum platform_inst_fw_cap_type {LAYER3_BITRATE_HEVC ,LAYER4_BITRATE_HEVC ,LAYER5_BITRATE_HEVC , +REQUEST_SYNC_FRAME , INST_FW_CAP_MAX, };
drivers/media/platform/qcom/iris/iris_platform_gen1.c +10 -0
@@ -397,6 +397,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 = 0, + .step_or_mask = 0, + .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 struct platform_inst_caps platform_inst_cap_sm8250 = {
drivers/media/platform/qcom/iris/iris_platform_gen2.c +11 -1
@@ -961,7 +961,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 = 0, + .step_or_mask = 0, + .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 struct platform_inst_caps platform_inst_cap_sm8550 = {
Signature · 1 line
2.43.0