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 v3 6/8] media: qcom: iris: move get_instance to iris_hfi_sys_ops
Date: Wed, 11 Mar 2026 07:05:07 +0200 [thread overview]
Message-ID: <20260311-iris-platform-data-v3-6-f02258c4d4ed@oss.qualcomm.com> (raw)
In-Reply-To: <20260311-iris-platform-data-v3-0-f02258c4d4ed@oss.qualcomm.com>
The get_instance() is a callback tightly connected to the HFI
implementation. Move it into the new iris_hfi_sys_ops structure, merging
all core callbacks into a single vtable.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
drivers/media/platform/qcom/iris/iris_hfi_common.h | 2 ++
drivers/media/platform/qcom/iris/iris_hfi_gen1.h | 2 --
.../platform/qcom/iris/iris_hfi_gen1_command.c | 28 ++++++++++----------
drivers/media/platform/qcom/iris/iris_hfi_gen2.h | 1 -
.../platform/qcom/iris/iris_hfi_gen2_command.c | 30 ++++++++++++----------
.../platform/qcom/iris/iris_platform_common.h | 1 -
.../media/platform/qcom/iris/iris_platform_gen1.c | 2 --
.../media/platform/qcom/iris/iris_platform_gen2.c | 4 ---
drivers/media/platform/qcom/iris/iris_vidc.c | 2 +-
9 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_common.h b/drivers/media/platform/qcom/iris/iris_hfi_common.h
index 9aa84a1d8f95..a27447eb2519 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_common.h
+++ b/drivers/media/platform/qcom/iris/iris_hfi_common.h
@@ -112,6 +112,8 @@ struct iris_hfi_sys_ops {
int (*sys_pc_prep)(struct iris_core *core);
void (*sys_hfi_response_handler)(struct iris_core *core);
+
+ struct iris_inst *(*sys_get_instance)(void);
};
struct iris_hfi_session_ops {
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.h b/drivers/media/platform/qcom/iris/iris_hfi_gen1.h
index 1c970243532a..0479ba442b09 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.h
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.h
@@ -7,10 +7,8 @@
#define __IRIS_HFI_GEN1_H__
struct iris_core;
-struct iris_inst;
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 eea9cc3e5904..abf02f589a28 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
@@ -1076,6 +1076,19 @@ static const struct iris_hfi_session_ops iris_hfi_gen1_session_ops = {
.session_close = iris_hfi_gen1_session_close,
};
+static struct iris_inst *iris_hfi_gen1_get_instance(void)
+{
+ struct iris_inst *out;
+
+ out = kzalloc_obj(*out);
+ if (!out)
+ return NULL;
+
+ out->hfi_session_ops = &iris_hfi_gen1_session_ops;
+
+ return out;
+}
+
static const struct iris_hfi_sys_ops iris_hfi_gen1_ops = {
.sys_init = iris_hfi_gen1_sys_init,
.sys_image_version = iris_hfi_gen1_sys_image_version,
@@ -1083,22 +1096,11 @@ static const struct iris_hfi_sys_ops iris_hfi_gen1_ops = {
.sys_pc_prep = iris_hfi_gen1_sys_pc_prep,
.sys_hfi_response_handler = iris_hfi_gen1_response_handler,
+
+ .sys_get_instance = iris_hfi_gen1_get_instance,
};
void iris_hfi_gen1_ops_init(struct iris_core *core)
{
core->hfi_sys_ops = &iris_hfi_gen1_ops;
}
-
-struct iris_inst *iris_hfi_gen1_get_instance(void)
-{
- struct iris_inst *out;
-
- out = kzalloc_obj(*out);
- if (!out)
- return NULL;
-
- out->hfi_session_ops = &iris_hfi_gen1_session_ops;
-
- return out;
-}
diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2.h
index b981a1ba6954..f1d293759bc6 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.h
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.h
@@ -36,6 +36,5 @@ struct iris_inst_hfi_gen2 {
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 a875fa906193..6ce94f4dfe08 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
@@ -1315,6 +1315,20 @@ static const struct iris_hfi_session_ops iris_hfi_gen2_session_ops = {
.session_close = iris_hfi_gen2_session_close,
};
+static struct iris_inst *iris_hfi_gen2_get_instance(void)
+{
+ struct iris_inst_hfi_gen2 *out;
+
+ /* The allocation is intentionally larger than struct iris_inst. */
+ out = kzalloc_obj(*out);
+ if (!out)
+ return NULL;
+
+ out->inst.hfi_session_ops = &iris_hfi_gen2_session_ops;
+
+ return &out->inst;
+}
+
static const struct iris_hfi_sys_ops iris_hfi_gen2_ops = {
.sys_init = iris_hfi_gen2_sys_init,
.sys_image_version = iris_hfi_gen2_sys_image_version,
@@ -1322,23 +1336,11 @@ static const struct iris_hfi_sys_ops iris_hfi_gen2_ops = {
.sys_pc_prep = iris_hfi_gen2_sys_pc_prep,
.sys_hfi_response_handler = iris_hfi_gen2_response_handler,
+
+ .sys_get_instance = iris_hfi_gen2_get_instance,
};
void iris_hfi_gen2_ops_init(struct iris_core *core)
{
core->hfi_sys_ops = &iris_hfi_gen2_ops;
}
-
-struct iris_inst *iris_hfi_gen2_get_instance(void)
-{
- struct iris_inst_hfi_gen2 *out;
-
- /* The allocation is intentionally larger than struct iris_inst. */
- out = kzalloc_obj(*out);
- if (!out)
- return NULL;
-
- out->inst.hfi_session_ops = &iris_hfi_gen2_session_ops;
-
- return &out->inst;
-}
diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
index 6b76a9046f9a..d1daef2d874b 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -203,7 +203,6 @@ enum platform_pm_domain_type {
struct iris_platform_data {
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;
const struct icc_info *icc_tbl;
diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/drivers/media/platform/qcom/iris/iris_platform_gen1.c
index 75dd496e2984..d8d205fbd61b 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c
@@ -333,7 +333,6 @@ 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_ops = &iris_hfi_gen1_ops_init,
.get_vpu_buffer_size = iris_vpu_buf_size,
.vpu_ops = &iris_vpu2_ops,
@@ -385,7 +384,6 @@ const struct iris_platform_data sm8250_data = {
};
const struct iris_platform_data sc7280_data = {
- .get_instance = iris_hfi_gen1_get_instance,
.init_hfi_ops = &iris_hfi_gen1_ops_init,
.get_vpu_buffer_size = iris_vpu_buf_size,
.vpu_ops = &iris_vpu2_ops,
diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
index d72d397a2c2b..0f8d67473c3a 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
@@ -907,7 +907,6 @@ 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_ops = iris_hfi_gen2_ops_init,
.get_vpu_buffer_size = iris_vpu_buf_size,
.vpu_ops = &iris_vpu3_ops,
@@ -1006,7 +1005,6 @@ const struct iris_platform_data sm8550_data = {
* - fwname to "qcom/vpu/vpu33_p4.mbn"
*/
const struct iris_platform_data sm8650_data = {
- .get_instance = iris_hfi_gen2_get_instance,
.init_hfi_ops = iris_hfi_gen2_ops_init,
.get_vpu_buffer_size = iris_vpu33_buf_size,
.vpu_ops = &iris_vpu33_ops,
@@ -1100,7 +1098,6 @@ const struct iris_platform_data sm8650_data = {
};
const struct iris_platform_data sm8750_data = {
- .get_instance = iris_hfi_gen2_get_instance,
.init_hfi_ops = iris_hfi_gen2_ops_init,
.get_vpu_buffer_size = iris_vpu33_buf_size,
.vpu_ops = &iris_vpu35_ops,
@@ -1196,7 +1193,6 @@ const struct iris_platform_data sm8750_data = {
* - inst_caps to platform_inst_cap_qcs8300
*/
const struct iris_platform_data qcs8300_data = {
- .get_instance = iris_hfi_gen2_get_instance,
.init_hfi_ops = iris_hfi_gen2_ops_init,
.get_vpu_buffer_size = iris_vpu_buf_size,
.vpu_ops = &iris_vpu3_ops,
diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
index 7e03d63578e1..ecd8a20fedbf 100644
--- a/drivers/media/platform/qcom/iris/iris_vidc.c
+++ b/drivers/media/platform/qcom/iris/iris_vidc.c
@@ -156,7 +156,7 @@ int iris_open(struct file *filp)
pm_runtime_put_sync(core->dev);
- inst = core->iris_platform_data->get_instance();
+ inst = core->hfi_sys_ops->sys_get_instance();
if (!inst)
return -ENOMEM;
--
2.47.3
next prev parent reply other threads:[~2026-03-11 5:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-11 5:05 [PATCH v3 0/8] media: qcom: iris: rework platform data handling Dmitry Baryshkov
2026-03-11 5:05 ` [PATCH v3 1/8] media: qcom: iris: drop pas_id from the iris_platform_data struct Dmitry Baryshkov
2026-03-11 5:05 ` [PATCH v3 2/8] media: qcom: iris: use common set_preset_registers function Dmitry Baryshkov
2026-03-11 5:05 ` [PATCH v3 3/8] media: qcom: iris: don't use function indirection in gen2-specific code Dmitry Baryshkov
2026-03-11 5:05 ` [PATCH v3 4/8] media: qcom: iris: split HFI session ops from core ops Dmitry Baryshkov
2026-03-11 5:05 ` [PATCH v3 5/8] media: qcom: iris: merge hfi_response_ops and hfi_command_ops Dmitry Baryshkov
2026-03-11 12:18 ` Dikshita Agarwal
2026-03-11 5:05 ` Dmitry Baryshkov [this message]
2026-03-11 5:05 ` [PATCH v3 7/8] media: qcom: iris: split firmware_data from raw platform data Dmitry Baryshkov
2026-03-11 5:05 ` [PATCH v3 8/8] 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=20260311-iris-platform-data-v3-6-f02258c4d4ed@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
all inboxes | Powered by JetHome®