From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
To: Vikash Garodia <vikash.garodia@oss.qualcomm.com>,
Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>,
Abhinav Kumar <abhinav.kumar@linux.dev>,
Bryan O'Donoghue <bod@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 04/11] media: qcom: iris: simplify HFI params handling
Date: Sat, 28 Feb 2026 17:26:31 +0200 [thread overview]
Message-ID: <20260228-iris-platform-data-v2-4-acf036a3c84c@oss.qualcomm.com> (raw)
In-Reply-To: <20260228-iris-platform-data-v2-0-acf036a3c84c@oss.qualcomm.com>
Instead of looping over two tables to select the static order of
functions, call necessary functsions directly in the correct order.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
.../platform/qcom/iris/iris_hfi_gen1_command.c | 116 ++++-----------
.../platform/qcom/iris/iris_hfi_gen2_command.c | 160 +++++++++++----------
2 files changed, 108 insertions(+), 168 deletions(-)
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 d5eaf8763f6d..b7aafda1d99e 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
@@ -978,107 +978,41 @@ static int iris_hfi_gen1_set_stride(struct iris_inst *inst, u32 plane)
return hfi_gen1_set_property(inst, ptype, &plane_actual_info, sizeof(plane_actual_info));
}
-static const u32 iris_hfi_gen1_vdec_input_config_param[] = {
- HFI_PROPERTY_CONFIG_VIDEOCORES_USAGE,
- HFI_PROPERTY_PARAM_UNCOMPRESSED_FORMAT_SELECT,
- HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_CONSTRAINTS_INFO,
- HFI_PROPERTY_PARAM_BUFFER_COUNT_ACTUAL,
- HFI_PROPERTY_PARAM_VDEC_MULTI_STREAM,
- HFI_PROPERTY_PARAM_FRAME_SIZE,
- HFI_PROPERTY_PARAM_BUFFER_SIZE_ACTUAL,
- HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE,
-};
-
-static const u32 iris_hfi_gen1_venc_input_config_param[] = {
- HFI_PROPERTY_CONFIG_FRAME_RATE,
- HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_INFO,
- HFI_PROPERTY_PARAM_FRAME_SIZE,
- HFI_PROPERTY_PARAM_UNCOMPRESSED_FORMAT_SELECT,
- HFI_PROPERTY_PARAM_BUFFER_COUNT_ACTUAL,
-};
-
static int iris_hfi_gen1_session_set_config_params(struct iris_inst *inst, u32 plane)
{
- struct iris_hfi_prop_type_handle const *handler = NULL;
- u32 handler_size = 0;
- u32 config_params_size, i, j;
- const u32 *config_params;
int ret;
- static const struct iris_hfi_prop_type_handle vdec_prop_type_handle_inp_arr[] = {
- {HFI_PROPERTY_PARAM_FRAME_SIZE,
- iris_hfi_gen1_set_resolution},
- {HFI_PROPERTY_CONFIG_VIDEOCORES_USAGE,
- iris_hfi_gen1_decide_core},
- {HFI_PROPERTY_PARAM_UNCOMPRESSED_FORMAT_SELECT,
- iris_hfi_gen1_set_raw_format},
- {HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_CONSTRAINTS_INFO,
- iris_hfi_gen1_set_format_constraints},
- {HFI_PROPERTY_PARAM_BUFFER_COUNT_ACTUAL,
- iris_hfi_gen1_set_num_bufs},
- {HFI_PROPERTY_PARAM_VDEC_MULTI_STREAM,
- iris_hfi_gen1_set_multistream},
- {HFI_PROPERTY_PARAM_BUFFER_SIZE_ACTUAL,
- iris_hfi_gen1_set_bufsize},
- };
-
- static const struct iris_hfi_prop_type_handle vdec_prop_type_handle_out_arr[] = {
- {HFI_PROPERTY_PARAM_FRAME_SIZE,
- iris_hfi_gen1_set_resolution},
- {HFI_PROPERTY_PARAM_UNCOMPRESSED_FORMAT_SELECT,
- iris_hfi_gen1_set_raw_format},
- {HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_CONSTRAINTS_INFO,
- iris_hfi_gen1_set_format_constraints},
- {HFI_PROPERTY_PARAM_BUFFER_COUNT_ACTUAL,
- iris_hfi_gen1_set_num_bufs},
- {HFI_PROPERTY_PARAM_VDEC_MULTI_STREAM,
- iris_hfi_gen1_set_multistream},
- {HFI_PROPERTY_PARAM_BUFFER_SIZE_ACTUAL,
- iris_hfi_gen1_set_bufsize},
- };
-
- static const struct iris_hfi_prop_type_handle venc_prop_type_handle_inp_arr[] = {
- {HFI_PROPERTY_CONFIG_FRAME_RATE,
- iris_hfi_gen1_set_frame_rate},
- {HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_INFO,
- iris_hfi_gen1_set_stride},
- {HFI_PROPERTY_PARAM_FRAME_SIZE,
- iris_hfi_gen1_set_resolution},
- {HFI_PROPERTY_PARAM_UNCOMPRESSED_FORMAT_SELECT,
- iris_hfi_gen1_set_raw_format},
- {HFI_PROPERTY_PARAM_BUFFER_COUNT_ACTUAL,
- iris_hfi_gen1_set_num_bufs},
- };
-
if (inst->domain == DECODER) {
- config_params = iris_hfi_gen1_vdec_input_config_param;
- config_params_size = ARRAY_SIZE(iris_hfi_gen1_vdec_input_config_param);
if (V4L2_TYPE_IS_OUTPUT(plane)) {
- handler = vdec_prop_type_handle_inp_arr;
- handler_size = ARRAY_SIZE(vdec_prop_type_handle_inp_arr);
- } else if (V4L2_TYPE_IS_CAPTURE(plane)) {
- handler = vdec_prop_type_handle_out_arr;
- handler_size = ARRAY_SIZE(vdec_prop_type_handle_out_arr);
+ ret = iris_hfi_gen1_decide_core(inst, plane);
+ if (ret)
+ return ret;
}
- } else {
- config_params = iris_hfi_gen1_venc_input_config_param;
- config_params_size = ARRAY_SIZE(iris_hfi_gen1_venc_input_config_param);
- handler = venc_prop_type_handle_inp_arr;
- handler_size = ARRAY_SIZE(venc_prop_type_handle_inp_arr);
- }
- for (i = 0; i < config_params_size; i++) {
- for (j = 0; j < handler_size; j++) {
- if (handler[j].type == config_params[i]) {
- ret = handler[j].handle(inst, plane);
- if (ret)
- return ret;
- break;
- }
- }
+ ret = iris_hfi_gen1_set_raw_format(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen1_set_format_constraints(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen1_set_num_bufs(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen1_set_multistream(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen1_set_resolution(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen1_set_bufsize(inst, plane);
+ } else {
+ ret = iris_hfi_gen1_set_frame_rate(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen1_set_stride(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen1_set_resolution(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen1_set_raw_format(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen1_set_num_bufs(inst, plane);
}
- return 0;
+ return ret;
}
static const struct iris_hfi_command_ops iris_hfi_gen1_command_ops = {
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 52fd1fd51946..28f352d99bf0 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
@@ -644,103 +644,109 @@ static const u32 iris_hfi_gen2_vdec_input_config_params_av1[] = {
HFI_PROP_SIGNAL_COLOR_INFO,
};
-static const u32 iris_hfi_gen2_venc_input_config_params[] = {
- HFI_PROP_COLOR_FORMAT,
- HFI_PROP_RAW_RESOLUTION,
- HFI_PROP_CROP_OFFSETS,
- HFI_PROP_LINEAR_STRIDE_SCANLINE,
- HFI_PROP_SIGNAL_COLOR_INFO,
-};
-
-static const u32 iris_hfi_gen2_vdec_output_config_params[] = {
- HFI_PROP_OPB_ENABLE,
- HFI_PROP_COLOR_FORMAT,
- HFI_PROP_LINEAR_STRIDE_SCANLINE,
-};
-
-static const u32 iris_hfi_gen2_venc_output_config_params[] = {
- HFI_PROP_BITSTREAM_RESOLUTION,
- HFI_PROP_CROP_OFFSETS,
- HFI_PROP_FRAME_RATE,
-};
-
static int iris_hfi_gen2_session_set_config_params(struct iris_inst *inst, u32 plane)
{
- u32 config_params_size = 0, i, j;
- const u32 *config_params = NULL;
int ret;
- static const struct iris_hfi_prop_type_handle prop_type_handle_arr[] = {
- {HFI_PROP_RAW_RESOLUTION, iris_hfi_gen2_set_raw_resolution },
- {HFI_PROP_BITSTREAM_RESOLUTION, iris_hfi_gen2_set_bitstream_resolution },
- {HFI_PROP_CROP_OFFSETS, iris_hfi_gen2_set_crop_offsets },
- {HFI_PROP_CODED_FRAMES, iris_hfi_gen2_set_coded_frames },
- {HFI_PROP_LUMA_CHROMA_BIT_DEPTH, iris_hfi_gen2_set_bit_depth },
- {HFI_PROP_BUFFER_FW_MIN_OUTPUT_COUNT, iris_hfi_gen2_set_min_output_count },
- {HFI_PROP_PIC_ORDER_CNT_TYPE, iris_hfi_gen2_set_picture_order_count },
- {HFI_PROP_SIGNAL_COLOR_INFO, iris_hfi_gen2_set_colorspace },
- {HFI_PROP_PROFILE, iris_hfi_gen2_set_profile },
- {HFI_PROP_LEVEL, iris_hfi_gen2_set_level },
- {HFI_PROP_OPB_ENABLE, iris_hfi_gen2_set_opb_enable },
- {HFI_PROP_COLOR_FORMAT, iris_hfi_gen2_set_colorformat },
- {HFI_PROP_LINEAR_STRIDE_SCANLINE, iris_hfi_gen2_set_linear_stride_scanline },
- {HFI_PROP_TIER, iris_hfi_gen2_set_tier },
- {HFI_PROP_FRAME_RATE, iris_hfi_gen2_set_frame_rate },
- {HFI_PROP_AV1_FILM_GRAIN_PRESENT, iris_hfi_gen2_set_film_grain },
- {HFI_PROP_AV1_SUPER_BLOCK_ENABLED, iris_hfi_gen2_set_super_block },
- {HFI_PROP_OPB_ENABLE, iris_hfi_gen2_set_opb_enable },
- };
-
if (inst->domain == DECODER) {
if (V4L2_TYPE_IS_OUTPUT(plane)) {
if (inst->codec == V4L2_PIX_FMT_H264) {
- config_params = iris_hfi_gen2_vdec_input_config_params_avc;
- config_params_size =
- ARRAY_SIZE(iris_hfi_gen2_vdec_input_config_params_avc);
+ ret = iris_hfi_gen2_set_bitstream_resolution(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_crop_offsets(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_bit_depth(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_coded_frames(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_min_output_count(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_picture_order_count(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_profile(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_level(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_colorspace(inst, plane);
} else if (inst->codec == V4L2_PIX_FMT_HEVC) {
- config_params = iris_hfi_gen2_vdec_input_config_params_hevc;
- config_params_size =
- ARRAY_SIZE(iris_hfi_gen2_vdec_input_config_params_hevc);
+ ret = iris_hfi_gen2_set_bitstream_resolution(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_crop_offsets(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_bit_depth(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_min_output_count(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_profile(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_level(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_tier(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_colorspace(inst, plane);
} else if (inst->codec == V4L2_PIX_FMT_VP9) {
- config_params = iris_hfi_gen2_vdec_input_config_params_vp9;
- config_params_size =
- ARRAY_SIZE(iris_hfi_gen2_vdec_input_config_params_vp9);
+ ret = iris_hfi_gen2_set_bitstream_resolution(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_crop_offsets(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_bit_depth(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_min_output_count(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_profile(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_level(inst, plane);
} else if (inst->codec == V4L2_PIX_FMT_AV1) {
- config_params = iris_hfi_gen2_vdec_input_config_params_av1;
- config_params_size =
- ARRAY_SIZE(iris_hfi_gen2_vdec_input_config_params_av1);
+ ret = iris_hfi_gen2_set_bitstream_resolution(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_crop_offsets(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_bit_depth(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_min_output_count(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_profile(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_level(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_tier(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_film_grain(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_super_block(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_colorspace(inst, plane);
} else {
- return -EINVAL;
+ ret = -EINVAL;
}
} else {
- config_params = iris_hfi_gen2_vdec_output_config_params;
- config_params_size = ARRAY_SIZE(iris_hfi_gen2_vdec_output_config_params);
+ ret = iris_hfi_gen2_set_opb_enable(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_colorformat(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_linear_stride_scanline(inst, plane);
}
} else {
if (V4L2_TYPE_IS_OUTPUT(plane)) {
- config_params = iris_hfi_gen2_venc_input_config_params;
- config_params_size = ARRAY_SIZE(iris_hfi_gen2_venc_input_config_params);
+ ret = iris_hfi_gen2_set_colorformat(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_raw_resolution(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_crop_offsets(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_linear_stride_scanline(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_colorspace(inst, plane);
} else {
- config_params = iris_hfi_gen2_venc_output_config_params;
- config_params_size = ARRAY_SIZE(iris_hfi_gen2_venc_output_config_params);
+ ret = iris_hfi_gen2_set_bitstream_resolution(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_crop_offsets(inst, plane);
+ if (!ret)
+ ret = iris_hfi_gen2_set_frame_rate(inst, plane);
}
}
- if (!config_params || !config_params_size)
- return -EINVAL;
-
- for (i = 0; i < config_params_size; i++) {
- for (j = 0; j < ARRAY_SIZE(prop_type_handle_arr); j++) {
- if (prop_type_handle_arr[j].type == config_params[i]) {
- ret = prop_type_handle_arr[j].handle(inst, plane);
- if (ret)
- return ret;
- break;
- }
- }
- }
-
- return 0;
+ return ret;
}
static int iris_hfi_gen2_session_set_codec(struct iris_inst *inst)
--
2.47.3
next prev parent reply other threads:[~2026-02-28 15:26 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-28 15:26 [PATCH v2 00/11] media: qcom: iris: rework platform data handling Dmitry Baryshkov
2026-02-28 15:26 ` [PATCH v2 01/11] media: qcom: iris: drop pas_id from the iris_platform_data struct Dmitry Baryshkov
2026-03-02 9:59 ` Konrad Dybcio
2026-03-02 11:02 ` Dikshita Agarwal
2026-02-28 15:26 ` [PATCH v2 02/11] media: qcom: iris: extract common set_preset_registers function Dmitry Baryshkov
2026-03-06 5:54 ` Dikshita Agarwal
2026-02-28 15:26 ` [PATCH v2 03/11] media: qcom: iris: handle HFI params directly Dmitry Baryshkov
2026-03-02 10:04 ` Konrad Dybcio
2026-03-02 12:22 ` Dmitry Baryshkov
2026-03-06 6:02 ` Dikshita Agarwal
2026-02-28 15:26 ` Dmitry Baryshkov [this message]
2026-03-02 10:15 ` [PATCH v2 04/11] media: qcom: iris: simplify HFI params handling Konrad Dybcio
2026-02-28 15:26 ` [PATCH v2 05/11] media: qcom: iris: handle HFI subscription properties directly Dmitry Baryshkov
2026-02-28 15:26 ` [PATCH v2 06/11] media: qcom: iris: don't use function indirection in gen2-specific code Dmitry Baryshkov
2026-03-02 10:16 ` Konrad Dybcio
2026-03-06 7:32 ` Dikshita Agarwal
2026-02-28 15:26 ` [PATCH v2 07/11] media: qcom: iris: split HFI session ops from core ops Dmitry Baryshkov
2026-03-06 8:35 ` Dikshita Agarwal
2026-02-28 15:26 ` [PATCH v2 08/11] media: qcom: iris: merge hfi_response_ops and hfi_command_ops Dmitry Baryshkov
2026-03-06 8:47 ` Dikshita Agarwal
2026-03-11 0:20 ` Dmitry Baryshkov
2026-02-28 15:26 ` [PATCH v2 09/11] media: qcom: iris: move get_instance to iris_hfi_ops Dmitry Baryshkov
2026-02-28 15:26 ` [PATCH v2 10/11] media: qcom: iris: split firmware_data from raw platform data Dmitry Baryshkov
2026-03-06 10:58 ` Dikshita Agarwal
2026-03-11 0:23 ` Dmitry Baryshkov
2026-03-11 5:09 ` Dikshita Agarwal
2026-03-11 5:32 ` Dmitry Baryshkov
2026-02-28 15:26 ` [PATCH v2 11/11] media: qcom: iris: split platform data from firmware data Dmitry Baryshkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260228-iris-platform-data-v2-4-acf036a3c84c@oss.qualcomm.com \
--to=dmitry.baryshkov@oss.qualcomm.com \
--cc=abhinav.kumar@linux.dev \
--cc=bod@kernel.org \
--cc=dikshita.agarwal@oss.qualcomm.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=vikash.garodia@oss.qualcomm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox