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 08/11] media: qcom: iris: merge hfi_response_ops and hfi_command_ops
Date: Sat, 28 Feb 2026 17:26:35 +0200 [thread overview]
Message-ID: <20260228-iris-platform-data-v2-8-acf036a3c84c@oss.qualcomm.com> (raw)
In-Reply-To: <20260228-iris-platform-data-v2-0-acf036a3c84c@oss.qualcomm.com>
There is little point in having two different structures for HFI-related
core ops. Merge both of them into the new iris_hfi_ops structure.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
drivers/media/platform/qcom/iris/iris_core.h | 2 +-
drivers/media/platform/qcom/iris/iris_hfi_common.c | 6 +++---
drivers/media/platform/qcom/iris/iris_hfi_common.h | 8 +++-----
drivers/media/platform/qcom/iris/iris_hfi_gen1.h | 4 ++--
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c | 8 +++++---
drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c | 11 +----------
drivers/media/platform/qcom/iris/iris_hfi_gen2.h | 4 ++--
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 8 +++++---
drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c | 11 +----------
drivers/media/platform/qcom/iris/iris_platform_common.h | 3 +--
drivers/media/platform/qcom/iris/iris_platform_gen1.c | 6 ++----
drivers/media/platform/qcom/iris/iris_platform_gen2.c | 12 ++++--------
drivers/media/platform/qcom/iris/iris_probe.c | 3 +--
13 files changed, 31 insertions(+), 55 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/iris_core.h b/drivers/media/platform/qcom/iris/iris_core.h
index d10a03aa5685..d919c7c16106 100644
--- a/drivers/media/platform/qcom/iris/iris_core.h
+++ b/drivers/media/platform/qcom/iris/iris_core.h
@@ -112,7 +112,7 @@ struct iris_core {
u32 header_id;
u32 packet_id;
struct iris_core_power power;
- const struct iris_hfi_command_ops *hfi_ops;
+ const struct iris_hfi_ops *hfi_ops;
const struct iris_hfi_response_ops *hfi_response_ops;
struct completion core_init_done;
u32 intr_status;
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_common.c b/drivers/media/platform/qcom/iris/iris_hfi_common.c
index 92112eb16c11..d6496e0fabde 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_common.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_common.c
@@ -76,7 +76,7 @@ u32 iris_hfi_get_v4l2_matrix_coefficients(u32 hfi_coefficients)
int iris_hfi_core_init(struct iris_core *core)
{
- const struct iris_hfi_command_ops *hfi_ops = core->hfi_ops;
+ const struct iris_hfi_ops *hfi_ops = core->hfi_ops;
int ret;
ret = hfi_ops->sys_init(core);
@@ -109,7 +109,7 @@ irqreturn_t iris_hfi_isr_handler(int irq, void *data)
iris_vpu_clear_interrupt(core);
mutex_unlock(&core->lock);
- core->hfi_response_ops->hfi_response_handler(core);
+ core->hfi_ops->hfi_response_handler(core);
if (!iris_vpu_watchdog(core, core->intr_status))
enable_irq(irq);
@@ -144,7 +144,7 @@ int iris_hfi_pm_suspend(struct iris_core *core)
int iris_hfi_pm_resume(struct iris_core *core)
{
- const struct iris_hfi_command_ops *ops = core->hfi_ops;
+ const struct iris_hfi_ops *ops = core->hfi_ops;
int ret;
ret = iris_vpu_power_on(core);
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_common.h b/drivers/media/platform/qcom/iris/iris_hfi_common.h
index 4f26b010249a..21bb35261073 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_common.h
+++ b/drivers/media/platform/qcom/iris/iris_hfi_common.h
@@ -105,11 +105,13 @@ struct iris_hfi_prop_type_handle {
int (*handle)(struct iris_inst *inst, u32 plane);
};
-struct iris_hfi_command_ops {
+struct iris_hfi_ops {
int (*sys_init)(struct iris_core *core);
int (*sys_image_version)(struct iris_core *core);
int (*sys_interframe_powercollapse)(struct iris_core *core);
int (*sys_pc_prep)(struct iris_core *core);
+
+ void (*hfi_response_handler)(struct iris_core *core);
};
struct iris_hfi_inst_ops {
@@ -129,10 +131,6 @@ struct iris_hfi_inst_ops {
int (*session_close)(struct iris_inst *inst);
};
-struct iris_hfi_response_ops {
- void (*hfi_response_handler)(struct iris_core *core);
-};
-
struct hfi_subscription_params {
u32 bitstream_resolution;
u32 crop_offsets[2];
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.h b/drivers/media/platform/qcom/iris/iris_hfi_gen1.h
index 19b8e9054a75..1c970243532a 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.h
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.h
@@ -9,8 +9,8 @@
struct iris_core;
struct iris_inst;
-void iris_hfi_gen1_command_ops_init(struct iris_core *core);
-void iris_hfi_gen1_response_ops_init(struct iris_core *core);
+void iris_hfi_gen1_ops_init(struct iris_core *core);
+void iris_hfi_gen1_response_handler(struct iris_core *core);
struct iris_inst *iris_hfi_gen1_get_instance(void);
#endif
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 fde8219309b0..7f0e5a75a301 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
@@ -1028,16 +1028,18 @@ static const struct iris_hfi_inst_ops iris_hfi_gen1_inst_ops = {
.session_close = iris_hfi_gen1_session_close,
};
-static const struct iris_hfi_command_ops iris_hfi_gen1_command_ops = {
+static const struct iris_hfi_ops iris_hfi_gen1_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,
+
+ .hfi_response_handler = iris_hfi_gen1_response_handler,
};
-void iris_hfi_gen1_command_ops_init(struct iris_core *core)
+void iris_hfi_gen1_ops_init(struct iris_core *core)
{
- core->hfi_ops = &iris_hfi_gen1_command_ops;
+ core->hfi_ops = &iris_hfi_gen1_ops;
}
struct iris_inst *iris_hfi_gen1_get_instance(void)
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
index 8e864c239e29..bfd7495bf44f 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c
@@ -688,7 +688,7 @@ static void iris_hfi_gen1_flush_debug_queue(struct iris_core *core, u8 *packet)
}
}
-static void iris_hfi_gen1_response_handler(struct iris_core *core)
+void iris_hfi_gen1_response_handler(struct iris_core *core)
{
memset(core->response_packet, 0, sizeof(struct hfi_pkt_hdr));
while (!iris_hfi_queue_msg_read(core, core->response_packet)) {
@@ -698,12 +698,3 @@ static void iris_hfi_gen1_response_handler(struct iris_core *core)
iris_hfi_gen1_flush_debug_queue(core, core->response_packet);
}
-
-static const struct iris_hfi_response_ops iris_hfi_gen1_response_ops = {
- .hfi_response_handler = iris_hfi_gen1_response_handler,
-};
-
-void iris_hfi_gen1_response_ops_init(struct iris_core *core)
-{
- core->hfi_response_ops = &iris_hfi_gen1_response_ops;
-}
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2.h
index b9d3749a10ef..b981a1ba6954 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.h
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.h
@@ -34,8 +34,8 @@ struct iris_inst_hfi_gen2 {
struct hfi_subscription_params dst_subcr_params;
};
-void iris_hfi_gen2_command_ops_init(struct iris_core *core);
-void iris_hfi_gen2_response_ops_init(struct iris_core *core);
+void iris_hfi_gen2_ops_init(struct iris_core *core);
+void iris_hfi_gen2_response_handler(struct iris_core *core);
struct iris_inst *iris_hfi_gen2_get_instance(void);
#endif
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 502767f1593d..12d286be94a8 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
@@ -1405,16 +1405,18 @@ static const struct iris_hfi_inst_ops iris_hfi_gen2_inst_ops = {
.session_close = iris_hfi_gen2_session_close,
};
-static const struct iris_hfi_command_ops iris_hfi_gen2_command_ops = {
+static const struct iris_hfi_ops iris_hfi_gen2_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,
+
+ .hfi_response_handler = iris_hfi_gen2_response_handler,
};
-void iris_hfi_gen2_command_ops_init(struct iris_core *core)
+void iris_hfi_gen2_ops_init(struct iris_core *core)
{
- core->hfi_ops = &iris_hfi_gen2_command_ops;
+ core->hfi_ops = &iris_hfi_gen2_ops;
}
struct iris_inst *iris_hfi_gen2_get_instance(void)
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
index 8e19f61bbbf9..c350d231265e 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
@@ -977,7 +977,7 @@ static void iris_hfi_gen2_flush_debug_queue(struct iris_core *core, u8 *packet)
}
}
-static void iris_hfi_gen2_response_handler(struct iris_core *core)
+void iris_hfi_gen2_response_handler(struct iris_core *core)
{
if (iris_vpu_watchdog(core, core->intr_status)) {
struct iris_hfi_packet pkt = {.type = HFI_SYS_ERROR_WD_TIMEOUT};
@@ -997,12 +997,3 @@ static void iris_hfi_gen2_response_handler(struct iris_core *core)
iris_hfi_gen2_flush_debug_queue(core, core->response_packet);
}
-
-static const struct iris_hfi_response_ops iris_hfi_gen2_response_ops = {
- .hfi_response_handler = iris_hfi_gen2_response_handler,
-};
-
-void iris_hfi_gen2_response_ops_init(struct iris_core *core)
-{
- core->hfi_response_ops = &iris_hfi_gen2_response_ops;
-}
diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
index f5eb17ae072c..8e330ce5e726 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -202,8 +202,7 @@ enum platform_pm_domain_type {
};
struct iris_platform_data {
- void (*init_hfi_command_ops)(struct iris_core *core);
- void (*init_hfi_response_ops)(struct iris_core *core);
+ void (*init_hfi_ops)(struct iris_core *core);
struct iris_inst *(*get_instance)(void);
u32 (*get_vpu_buffer_size)(struct iris_inst *inst, enum iris_buffer_type buffer_type);
const struct vpu_ops *vpu_ops;
diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/drivers/media/platform/qcom/iris/iris_platform_gen1.c
index 392f9ed94ba8..1906e480e2ec 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c
@@ -315,8 +315,7 @@ static const u32 sm8250_enc_ip_int_buf_tbl[] = {
const struct iris_platform_data sm8250_data = {
.get_instance = iris_hfi_gen1_get_instance,
- .init_hfi_command_ops = &iris_hfi_gen1_command_ops_init,
- .init_hfi_response_ops = iris_hfi_gen1_response_ops_init,
+ .init_hfi_ops = &iris_hfi_gen1_ops_init,
.get_vpu_buffer_size = iris_vpu_buf_size,
.vpu_ops = &iris_vpu2_ops,
.set_preset_registers = iris_vpu_set_preset_registers,
@@ -362,8 +361,7 @@ const struct iris_platform_data sm8250_data = {
const struct iris_platform_data sc7280_data = {
.get_instance = iris_hfi_gen1_get_instance,
- .init_hfi_command_ops = &iris_hfi_gen1_command_ops_init,
- .init_hfi_response_ops = iris_hfi_gen1_response_ops_init,
+ .init_hfi_ops = &iris_hfi_gen1_ops_init,
.get_vpu_buffer_size = iris_vpu_buf_size,
.vpu_ops = &iris_vpu2_ops,
.set_preset_registers = iris_vpu_set_preset_registers,
diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
index ef70472ecde5..09dcf01047c5 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
@@ -820,8 +820,7 @@ static const u32 sm8550_enc_op_int_buf_tbl[] = {
const struct iris_platform_data sm8550_data = {
.get_instance = iris_hfi_gen2_get_instance,
- .init_hfi_command_ops = iris_hfi_gen2_command_ops_init,
- .init_hfi_response_ops = iris_hfi_gen2_response_ops_init,
+ .init_hfi_ops = iris_hfi_gen2_ops_init,
.get_vpu_buffer_size = iris_vpu_buf_size,
.vpu_ops = &iris_vpu3_ops,
.set_preset_registers = iris_vpu_set_preset_registers,
@@ -877,8 +876,7 @@ const struct iris_platform_data sm8550_data = {
*/
const struct iris_platform_data sm8650_data = {
.get_instance = iris_hfi_gen2_get_instance,
- .init_hfi_command_ops = iris_hfi_gen2_command_ops_init,
- .init_hfi_response_ops = iris_hfi_gen2_response_ops_init,
+ .init_hfi_ops = iris_hfi_gen2_ops_init,
.get_vpu_buffer_size = iris_vpu33_buf_size,
.vpu_ops = &iris_vpu33_ops,
.set_preset_registers = iris_vpu_set_preset_registers,
@@ -929,8 +927,7 @@ const struct iris_platform_data sm8650_data = {
const struct iris_platform_data sm8750_data = {
.get_instance = iris_hfi_gen2_get_instance,
- .init_hfi_command_ops = iris_hfi_gen2_command_ops_init,
- .init_hfi_response_ops = iris_hfi_gen2_response_ops_init,
+ .init_hfi_ops = iris_hfi_gen2_ops_init,
.get_vpu_buffer_size = iris_vpu33_buf_size,
.vpu_ops = &iris_vpu35_ops,
.set_preset_registers = iris_vpu_set_preset_registers,
@@ -983,8 +980,7 @@ const struct iris_platform_data sm8750_data = {
*/
const struct iris_platform_data qcs8300_data = {
.get_instance = iris_hfi_gen2_get_instance,
- .init_hfi_command_ops = iris_hfi_gen2_command_ops_init,
- .init_hfi_response_ops = iris_hfi_gen2_response_ops_init,
+ .init_hfi_ops = iris_hfi_gen2_ops_init,
.get_vpu_buffer_size = iris_vpu_buf_size,
.vpu_ops = &iris_vpu3_ops,
.set_preset_registers = iris_vpu_set_preset_registers,
diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c
index 17bb11513648..c2d174a6e160 100644
--- a/drivers/media/platform/qcom/iris/iris_probe.c
+++ b/drivers/media/platform/qcom/iris/iris_probe.c
@@ -257,8 +257,7 @@ static int iris_probe(struct platform_device *pdev)
disable_irq_nosync(core->irq);
iris_init_ops(core);
- core->iris_platform_data->init_hfi_command_ops(core);
- core->iris_platform_data->init_hfi_response_ops(core);
+ core->iris_platform_data->init_hfi_ops(core);
ret = iris_init_resources(core);
if (ret)
--
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 ` [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
2026-02-28 15:26 ` Dmitry Baryshkov [this message]
2026-03-06 8:47 ` [PATCH v2 08/11] media: qcom: iris: merge hfi_response_ops and hfi_command_ops 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-8-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