From: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
To: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>,
Vikash Garodia <vikash.garodia@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: Re: [PATCH v2 07/11] media: qcom: iris: split HFI session ops from core ops
Date: Fri, 6 Mar 2026 14:05:43 +0530 [thread overview]
Message-ID: <69150451-3580-e7d9-9ed9-1d3fc0a2476b@oss.qualcomm.com> (raw)
In-Reply-To: <20260228-iris-platform-data-v2-7-acf036a3c84c@oss.qualcomm.com>
On 2/28/2026 8:56 PM, Dmitry Baryshkov wrote:
> Calling HFI instance-specific ops should not require double indirection
> through the core ops. Split instance-specific ops to a separate struct,
> keep a pointer to it in struct iris_inst and set it directly in the
> get_instance function.
>
IMO, In this case better names could be hfi_sys_ops and hfi_session_ops.
Thanks,
Dikshita
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
> drivers/media/platform/qcom/iris/iris_buffer.c | 4 +-
> drivers/media/platform/qcom/iris/iris_common.c | 8 ++--
> drivers/media/platform/qcom/iris/iris_ctrls.c | 46 +++++++++++-----------
> drivers/media/platform/qcom/iris/iris_hfi_common.h | 3 ++
> .../platform/qcom/iris/iris_hfi_gen1_command.c | 23 ++++++++---
> .../platform/qcom/iris/iris_hfi_gen2_command.c | 17 +++++---
> drivers/media/platform/qcom/iris/iris_instance.h | 4 ++
> drivers/media/platform/qcom/iris/iris_vb2.c | 2 +-
> drivers/media/platform/qcom/iris/iris_vdec.c | 6 +--
> drivers/media/platform/qcom/iris/iris_venc.c | 4 +-
> drivers/media/platform/qcom/iris/iris_vidc.c | 2 +-
> 11 files changed, 72 insertions(+), 47 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c
> index 9151f43bc6b9..915096b21279 100644
> --- a/drivers/media/platform/qcom/iris/iris_buffer.c
> +++ b/drivers/media/platform/qcom/iris/iris_buffer.c
> @@ -404,7 +404,7 @@ int iris_create_internal_buffers(struct iris_inst *inst, u32 plane)
>
> int iris_queue_buffer(struct iris_inst *inst, struct iris_buffer *buf)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> int ret;
>
> ret = hfi_ops->session_queue_buf(inst, buf);
> @@ -572,7 +572,7 @@ int iris_destroy_dequeued_internal_buffers(struct iris_inst *inst, u32 plane)
> static int iris_release_internal_buffers(struct iris_inst *inst,
> enum iris_buffer_type buffer_type)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> struct iris_buffers *buffers = &inst->buffers[buffer_type];
> struct iris_buffer *buffer, *next;
> int ret;
> diff --git a/drivers/media/platform/qcom/iris/iris_common.c b/drivers/media/platform/qcom/iris/iris_common.c
> index 7f1c7fe144f7..69748e5764f3 100644
> --- a/drivers/media/platform/qcom/iris/iris_common.c
> +++ b/drivers/media/platform/qcom/iris/iris_common.c
> @@ -48,7 +48,7 @@ void iris_set_ts_metadata(struct iris_inst *inst, struct vb2_v4l2_buffer *vbuf)
>
> int iris_process_streamon_input(struct iris_inst *inst)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> enum iris_inst_sub_state set_sub_state = 0;
> int ret;
>
> @@ -90,7 +90,7 @@ int iris_process_streamon_input(struct iris_inst *inst)
>
> int iris_process_streamon_output(struct iris_inst *inst)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> enum iris_inst_sub_state clear_sub_state = 0;
> bool drain_active, drc_active, first_ipsc;
> int ret = 0;
> @@ -189,7 +189,7 @@ static void iris_flush_deferred_buffers(struct iris_inst *inst,
>
> static void iris_kill_session(struct iris_inst *inst)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
>
> if (!inst->session_id)
> return;
> @@ -200,7 +200,7 @@ static void iris_kill_session(struct iris_inst *inst)
>
> int iris_session_streamoff(struct iris_inst *inst, u32 plane)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> enum iris_buffer_type buffer_type;
> int ret;
>
> diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c
> index 3cec957580f5..f5032c5eb5a5 100644
> --- a/drivers/media/platform/qcom/iris/iris_ctrls.c
> +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c
> @@ -399,7 +399,7 @@ static u32 iris_get_port_info(struct iris_inst *inst,
>
> int iris_set_u32_enum(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 hfi_value = inst->fw_caps[cap_id].value;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
>
> @@ -412,7 +412,7 @@ int iris_set_u32_enum(struct iris_inst *inst, enum platform_inst_fw_cap_type cap
>
> int iris_set_u32(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 hfi_value = inst->fw_caps[cap_id].value;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
>
> @@ -425,7 +425,7 @@ int iris_set_u32(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
>
> int iris_set_stage(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> struct v4l2_format *inp_f = inst->fmt_src;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> u32 height = inp_f->fmt.pix_mp.height;
> @@ -446,7 +446,7 @@ int iris_set_stage(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id
>
> int iris_set_pipe(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 work_route = inst->fw_caps[PIPE].value;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
>
> @@ -459,7 +459,7 @@ int iris_set_pipe(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
>
> int iris_set_profile(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 hfi_id, hfi_value;
>
> if (inst->codec == V4L2_PIX_FMT_H264) {
> @@ -479,7 +479,7 @@ int iris_set_profile(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_
>
> int iris_set_level(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 hfi_id, hfi_value;
>
> if (inst->codec == V4L2_PIX_FMT_H264) {
> @@ -499,7 +499,7 @@ int iris_set_level(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id
>
> int iris_set_profile_level_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> struct hfi_profile_level pl;
>
> @@ -520,7 +520,7 @@ int iris_set_profile_level_gen1(struct iris_inst *inst, enum platform_inst_fw_ca
>
> int iris_set_header_mode_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 header_mode = inst->fw_caps[cap_id].value;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> u32 hfi_val;
> @@ -539,7 +539,7 @@ int iris_set_header_mode_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_
>
> int iris_set_header_mode_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 prepend_sps_pps = inst->fw_caps[PREPEND_SPSPPS_TO_IDR].value;
> u32 header_mode = inst->fw_caps[cap_id].value;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> @@ -561,7 +561,7 @@ int iris_set_header_mode_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_
>
> int iris_set_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 entropy_mode = inst->fw_caps[ENTROPY_MODE].value;
> u32 bitrate = inst->fw_caps[cap_id].value;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> @@ -586,7 +586,7 @@ int iris_set_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_
>
> int iris_set_peak_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 rc_mode = inst->fw_caps[BITRATE_MODE].value;
> u32 peak_bitrate = inst->fw_caps[cap_id].value;
> u32 bitrate = inst->fw_caps[BITRATE].value;
> @@ -613,7 +613,7 @@ int iris_set_peak_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_type
>
> int iris_set_bitrate_mode_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 bitrate_mode = inst->fw_caps[BITRATE_MODE].value;
> u32 frame_rc = inst->fw_caps[FRAME_RC_ENABLE].value;
> u32 frame_skip = inst->fw_caps[FRAME_SKIP_MODE].value;
> @@ -640,7 +640,7 @@ int iris_set_bitrate_mode_gen1(struct iris_inst *inst, enum platform_inst_fw_cap
>
> int iris_set_bitrate_mode_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 bitrate_mode = inst->fw_caps[BITRATE_MODE].value;
> u32 frame_rc = inst->fw_caps[FRAME_RC_ENABLE].value;
> u32 frame_skip = inst->fw_caps[FRAME_SKIP_MODE].value;
> @@ -667,7 +667,7 @@ int iris_set_bitrate_mode_gen2(struct iris_inst *inst, enum platform_inst_fw_cap
>
> int iris_set_entropy_mode_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 entropy_mode = inst->fw_caps[cap_id].value;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> u32 hfi_val;
> @@ -687,7 +687,7 @@ int iris_set_entropy_mode_gen1(struct iris_inst *inst, enum platform_inst_fw_cap
>
> int iris_set_entropy_mode_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 entropy_mode = inst->fw_caps[cap_id].value;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> u32 profile;
> @@ -712,7 +712,7 @@ int iris_set_entropy_mode_gen2(struct iris_inst *inst, enum platform_inst_fw_cap
>
> int iris_set_min_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 i_qp_enable = 0, p_qp_enable = 0, b_qp_enable = 0;
> u32 i_frame_qp = 0, p_frame_qp = 0, b_frame_qp = 0;
> u32 min_qp_enable = 0, client_qp_enable = 0;
> @@ -776,7 +776,7 @@ int iris_set_min_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_i
>
> int iris_set_max_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 i_qp_enable = 0, p_qp_enable = 0, b_qp_enable = 0;
> u32 max_qp_enable = 0, client_qp_enable;
> u32 i_frame_qp, p_frame_qp, b_frame_qp;
> @@ -841,7 +841,7 @@ int iris_set_max_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_i
>
> int iris_set_frame_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 i_qp_enable = 0, p_qp_enable = 0, b_qp_enable = 0, client_qp_enable;
> u32 i_frame_qp, p_frame_qp, b_frame_qp;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> @@ -902,7 +902,7 @@ int iris_set_frame_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap
>
> int iris_set_qp_range(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> struct hfi_quantization_range_v2 range;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
>
> @@ -923,7 +923,7 @@ int iris_set_qp_range(struct iris_inst *inst, enum platform_inst_fw_cap_type cap
>
> int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> u32 hfi_val;
>
> @@ -953,7 +953,7 @@ int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_type cap
>
> int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
> u32 hfi_val = HFI_DISABLE_FLIP;
>
> @@ -972,7 +972,7 @@ int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
>
> int iris_set_ir_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;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> struct vb2_queue *q = v4l2_m2m_get_dst_vq(inst->m2m_ctx);
> u32 ir_period = inst->fw_caps[cap_id].value;
> u32 ir_type = 0;
> @@ -998,7 +998,7 @@ int iris_set_ir_period(struct iris_inst *inst, enum platform_inst_fw_cap_type ca
>
> int iris_set_properties(struct iris_inst *inst, u32 plane)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> struct platform_inst_fw_cap *cap;
> int ret;
> u32 i;
> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_common.h b/drivers/media/platform/qcom/iris/iris_hfi_common.h
> index 3edb5ae582b4..4f26b010249a 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_common.h
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_common.h
> @@ -110,6 +110,9 @@ struct iris_hfi_command_ops {
> int (*sys_image_version)(struct iris_core *core);
> int (*sys_interframe_powercollapse)(struct iris_core *core);
> int (*sys_pc_prep)(struct iris_core *core);
> +};
> +
> +struct iris_hfi_inst_ops {
> int (*session_set_config_params)(struct iris_inst *inst, u32 plane);
> int (*session_set_property)(struct iris_inst *inst,
> u32 packet_type, u32 flag, u32 plane, u32 payload_type,
> 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 b7aafda1d99e..fde8219309b0 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
> @@ -1015,11 +1015,7 @@ static int iris_hfi_gen1_session_set_config_params(struct iris_inst *inst, u32 p
> return ret;
> }
>
> -static const struct iris_hfi_command_ops iris_hfi_gen1_command_ops = {
> - .sys_init = iris_hfi_gen1_sys_init,
> - .sys_image_version = iris_hfi_gen1_sys_image_version,
> - .sys_interframe_powercollapse = iris_hfi_gen1_sys_interframe_powercollapse,
> - .sys_pc_prep = iris_hfi_gen1_sys_pc_prep,
> +static const struct iris_hfi_inst_ops iris_hfi_gen1_inst_ops = {
> .session_open = iris_hfi_gen1_session_open,
> .session_set_config_params = iris_hfi_gen1_session_set_config_params,
> .session_set_property = iris_hfi_gen1_session_set_property,
> @@ -1032,6 +1028,13 @@ static const struct iris_hfi_command_ops iris_hfi_gen1_command_ops = {
> .session_close = iris_hfi_gen1_session_close,
> };
>
> +static const struct iris_hfi_command_ops iris_hfi_gen1_command_ops = {
> + .sys_init = iris_hfi_gen1_sys_init,
> + .sys_image_version = iris_hfi_gen1_sys_image_version,
> + .sys_interframe_powercollapse = iris_hfi_gen1_sys_interframe_powercollapse,
> + .sys_pc_prep = iris_hfi_gen1_sys_pc_prep,
> +};
> +
> void iris_hfi_gen1_command_ops_init(struct iris_core *core)
> {
> core->hfi_ops = &iris_hfi_gen1_command_ops;
> @@ -1039,5 +1042,13 @@ void iris_hfi_gen1_command_ops_init(struct iris_core *core)
>
> struct iris_inst *iris_hfi_gen1_get_instance(void)
> {
> - return kzalloc_obj(struct iris_inst);
> + struct iris_inst *out;
> +
> + out = kzalloc_obj(*out);
> + if (!out)
> + return NULL;
> +
> + out->hfi_ops = &iris_hfi_gen1_inst_ops;
> +
> + return out;
> }
> 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 93ce7ac3a19c..502767f1593d 100644
> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
> @@ -1390,11 +1390,7 @@ static int iris_hfi_gen2_session_release_buffer(struct iris_inst *inst, struct i
> inst_hfi_gen2->packet->size);
> }
>
> -static const struct iris_hfi_command_ops iris_hfi_gen2_command_ops = {
> - .sys_init = iris_hfi_gen2_sys_init,
> - .sys_image_version = iris_hfi_gen2_sys_image_version,
> - .sys_interframe_powercollapse = iris_hfi_gen2_sys_interframe_powercollapse,
> - .sys_pc_prep = iris_hfi_gen2_sys_pc_prep,
> +static const struct iris_hfi_inst_ops iris_hfi_gen2_inst_ops = {
> .session_open = iris_hfi_gen2_session_open,
> .session_set_config_params = iris_hfi_gen2_session_set_config_params,
> .session_set_property = iris_hfi_gen2_session_set_property,
> @@ -1409,6 +1405,13 @@ static const struct iris_hfi_command_ops iris_hfi_gen2_command_ops = {
> .session_close = iris_hfi_gen2_session_close,
> };
>
> +static const struct iris_hfi_command_ops iris_hfi_gen2_command_ops = {
> + .sys_init = iris_hfi_gen2_sys_init,
> + .sys_image_version = iris_hfi_gen2_sys_image_version,
> + .sys_interframe_powercollapse = iris_hfi_gen2_sys_interframe_powercollapse,
> + .sys_pc_prep = iris_hfi_gen2_sys_pc_prep,
> +};
> +
> void iris_hfi_gen2_command_ops_init(struct iris_core *core)
> {
> core->hfi_ops = &iris_hfi_gen2_command_ops;
> @@ -1420,6 +1423,10 @@ struct iris_inst *iris_hfi_gen2_get_instance(void)
>
> /* The allocation is intentionally larger than struct iris_inst. */
> out = kzalloc_obj(*out);
> + if (!out)
> + return NULL;
> +
> + out->inst.hfi_ops = &iris_hfi_gen2_inst_ops;
>
> return &out->inst;
> }
> diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h
> index 16965150f427..c58e8ec24c62 100644
> --- a/drivers/media/platform/qcom/iris/iris_instance.h
> +++ b/drivers/media/platform/qcom/iris/iris_instance.h
> @@ -15,6 +15,8 @@
> #define DEFAULT_WIDTH 320
> #define DEFAULT_HEIGHT 240
>
> +struct iris_hfi_inst_ops;
> +
> enum iris_fmt_type_out {
> IRIS_FMT_H264,
> IRIS_FMT_HEVC,
> @@ -38,6 +40,7 @@ struct iris_fmt {
> * @list: used for attach an instance to the core
> * @core: pointer to core structure
> * @session_id: id of current video session
> + * @hfi_ops: iris HFI instance ops
> * @ctx_q_lock: lock to serialize queues related ioctls
> * @lock: lock to seralise forward and reverse threads
> * @fh: reference of v4l2 file handler
> @@ -80,6 +83,7 @@ struct iris_inst {
> struct list_head list;
> struct iris_core *core;
> u32 session_id;
> + const struct iris_hfi_inst_ops *hfi_ops;
> struct mutex ctx_q_lock;/* lock to serialize queues related ioctls */
> struct mutex lock; /* lock to serialize forward and reverse threads */
> struct v4l2_fh fh;
> diff --git a/drivers/media/platform/qcom/iris/iris_vb2.c b/drivers/media/platform/qcom/iris/iris_vb2.c
> index bf0b8400996e..104910419dd1 100644
> --- a/drivers/media/platform/qcom/iris/iris_vb2.c
> +++ b/drivers/media/platform/qcom/iris/iris_vb2.c
> @@ -129,7 +129,7 @@ int iris_vb2_queue_setup(struct vb2_queue *q,
> if (!inst->once_per_session_set) {
> inst->once_per_session_set = true;
>
> - ret = core->hfi_ops->session_open(inst);
> + ret = inst->hfi_ops->session_open(inst);
> if (ret) {
> ret = -EINVAL;
> dev_err(core->dev, "session open failed\n");
> diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c
> index 719217399a30..a48771687c10 100644
> --- a/drivers/media/platform/qcom/iris/iris_vdec.c
> +++ b/drivers/media/platform/qcom/iris/iris_vdec.c
> @@ -374,7 +374,7 @@ int iris_vdec_streamon_input(struct iris_inst *inst)
>
> int iris_vdec_streamon_output(struct iris_inst *inst)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> int ret;
>
> ret = hfi_ops->session_set_config_params(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
> @@ -434,7 +434,7 @@ int iris_vdec_qbuf(struct iris_inst *inst, struct vb2_v4l2_buffer *vbuf)
>
> int iris_vdec_start_cmd(struct iris_inst *inst)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> enum iris_inst_sub_state clear_sub_state = 0;
> struct vb2_queue *dst_vq;
> int ret;
> @@ -497,7 +497,7 @@ int iris_vdec_start_cmd(struct iris_inst *inst)
>
> int iris_vdec_stop_cmd(struct iris_inst *inst)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> int ret;
>
> ret = hfi_ops->session_drain(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
> diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c
> index aa27b22704eb..ffa7d5a91d15 100644
> --- a/drivers/media/platform/qcom/iris/iris_venc.c
> +++ b/drivers/media/platform/qcom/iris/iris_venc.c
> @@ -581,7 +581,7 @@ int iris_venc_qbuf(struct iris_inst *inst, struct vb2_v4l2_buffer *vbuf)
>
> int iris_venc_start_cmd(struct iris_inst *inst)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> enum iris_inst_sub_state clear_sub_state = 0;
> struct vb2_queue *dst_vq;
> int ret;
> @@ -623,7 +623,7 @@ int iris_venc_start_cmd(struct iris_inst *inst)
>
> int iris_venc_stop_cmd(struct iris_inst *inst)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> int ret;
>
> ret = hfi_ops->session_drain(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
> diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
> index bd38d84c9cc7..eddf2694e759 100644
> --- a/drivers/media/platform/qcom/iris/iris_vidc.c
> +++ b/drivers/media/platform/qcom/iris/iris_vidc.c
> @@ -224,7 +224,7 @@ int iris_open(struct file *filp)
>
> static void iris_session_close(struct iris_inst *inst)
> {
> - const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
> + const struct iris_hfi_inst_ops *hfi_ops = inst->hfi_ops;
> bool wait_for_response = true;
> int ret;
>
>
next prev parent reply other threads:[~2026-03-06 8:35 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 ` [PATCH v2 04/11] media: qcom: iris: simplify HFI params handling Dmitry Baryshkov
2026-03-02 10:15 ` 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 [this message]
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=69150451-3580-e7d9-9ed9-1d3fc0a2476b@oss.qualcomm.com \
--to=dikshita.agarwal@oss.qualcomm.com \
--cc=abhinav.kumar@linux.dev \
--cc=bod@kernel.org \
--cc=dmitry.baryshkov@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