[PATCH 1/2] media: qcom: iris: gen2: subscribe to the picture type on the encoder instance
From: Neil Armstrong
Date: Tue Nov 17 2026 - 10:21:44 EST
The GEN2 iris expects the HFI_PROP_PICTURE_TYPE for the encoded
buffers, but HFI_PROP_PICTURE_TYPE is never subscribed for the
ENCODER instance in iris_hfi_gen2_subscribe_property().
Add the necessary tables along the vdec input and output properties
table for the GEN2 hardware.
The tables are aligned with the vdec and downstream iris driver
implementation subscribing to HFI_PROP_NO_OUTPUT for the input
queue and HFI_PROP_PICTURE_TYPE for the output queue.
Signed-off-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
---
drivers/media/platform/qcom/iris/iris_hfi_gen2.c | 23 ++++++++++++++++++++++
.../platform/qcom/iris/iris_hfi_gen2_command.c | 15 +++++++++-----
.../platform/qcom/iris/iris_platform_common.h | 5 +++++
3 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c
index 79bbd06ef8d2..3b0fb408f05d 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c
@@ -1906,6 +1906,14 @@ static const u32 sm8550_vdec_subscribe_output_properties_av1[] = {
HFI_PROP_WORST_COMPLEXITY_FACTOR,
};
+static const u32 sm8550_venc_subscribe_input_properties[] = {
+ HFI_PROP_NO_OUTPUT,
+};
+
+static const u32 sm8550_venc_subscribe_output_properties[] = {
+ HFI_PROP_PICTURE_TYPE,
+};
+
static const u32 sm8550_dec_ip_int_buf_tbl[] = {
BUF_BIN,
BUF_COMV,
@@ -1985,6 +1993,11 @@ const struct iris_firmware_data iris_hfi_gen2_data = {
.dec_output_prop_av1_size =
ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_av1),
+ .enc_input_prop = sm8550_venc_subscribe_input_properties,
+ .enc_input_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_input_properties),
+ .enc_output_prop = sm8550_venc_subscribe_output_properties,
+ .enc_output_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_output_properties),
+
.dec_ip_int_buf_tbl = sm8550_dec_ip_int_buf_tbl,
.dec_ip_int_buf_tbl_size = ARRAY_SIZE(sm8550_dec_ip_int_buf_tbl),
.dec_op_int_buf_tbl = sm8550_dec_op_int_buf_tbl,
@@ -2032,6 +2045,11 @@ const struct iris_firmware_data iris_hfi_milos_data = {
.enc_output_config_params_size =
ARRAY_SIZE(sm8550_venc_output_config_params),
+ .enc_input_prop = sm8550_venc_subscribe_input_properties,
+ .enc_input_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_input_properties),
+ .enc_output_prop = sm8550_venc_subscribe_output_properties,
+ .enc_output_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_output_properties),
+
.dec_input_prop = sm8550_vdec_subscribe_input_properties,
.dec_input_prop_size = ARRAY_SIZE(sm8550_vdec_subscribe_input_properties),
.dec_output_prop_avc = sm8550_vdec_subscribe_output_properties_avc,
@@ -2920,6 +2938,11 @@ const struct iris_firmware_data iris_hfi_gen2_ar50lt_data = {
.enc_output_config_params_size =
ARRAY_SIZE(sm8550_venc_output_config_params),
+ .enc_input_prop = sm8550_venc_subscribe_input_properties,
+ .enc_input_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_input_properties),
+ .enc_output_prop = sm8550_venc_subscribe_output_properties,
+ .enc_output_prop_size = ARRAY_SIZE(sm8550_venc_subscribe_output_properties),
+
.dec_input_prop = sm8550_vdec_subscribe_input_properties,
.dec_input_prop_size = ARRAY_SIZE(sm8550_vdec_subscribe_input_properties),
.dec_output_prop_avc = sm8550_vdec_subscribe_output_properties_avc,
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
index 388a36ff2b07..6131d22c579f 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
@@ -1059,12 +1059,17 @@ static int iris_hfi_gen2_subscribe_property(struct iris_inst *inst, u32 plane)
payload[0] = HFI_MODE_PROPERTY;
- if (inst->domain == ENCODER)
- return 0;
-
if (V4L2_TYPE_IS_OUTPUT(plane)) {
- subscribe_prop_size = core->iris_firmware_data->dec_input_prop_size;
- subcribe_prop = core->iris_firmware_data->dec_input_prop;
+ if (inst->domain == ENCODER) {
+ subscribe_prop_size = core->iris_firmware_data->enc_input_prop_size;
+ subcribe_prop = core->iris_firmware_data->enc_input_prop;
+ } else {
+ subscribe_prop_size = core->iris_firmware_data->dec_input_prop_size;
+ subcribe_prop = core->iris_firmware_data->dec_input_prop;
+ }
+ } else if (inst->domain == ENCODER) {
+ subscribe_prop_size = core->iris_firmware_data->enc_output_prop_size;
+ subcribe_prop = core->iris_firmware_data->enc_output_prop;
} else {
switch (inst->codec) {
case V4L2_PIX_FMT_H264:
diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
index cddab9a9c375..cf5ae420f646 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -303,6 +303,11 @@ struct iris_firmware_data {
const u32 *dec_output_prop_av1;
unsigned int dec_output_prop_av1_size;
+ const u32 *enc_input_prop;
+ unsigned int enc_input_prop_size;
+ const u32 *enc_output_prop;
+ unsigned int enc_output_prop_size;
+
const u32 *dec_ip_int_buf_tbl;
unsigned int dec_ip_int_buf_tbl_size;
const u32 *dec_op_int_buf_tbl;
--
2.34.1