github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: qcom: iris: move get_instance to iris_hfi_sys_ops

Browse Source 
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.

Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Reviewed-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
This commit is contained in:
Dmitry Baryshkov 2026-03-29 02:33:07 +02:00 committed by Bryan O'Donoghue
parent d8a6a63372
commit c8f12e754e
9 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/qcom/iris/iris_hfi_common.h
View File

@ -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 {

2
drivers/media/platform/qcom/iris/iris_hfi_gen1.h
View File

@ -7,10 +7,8 @@
#define __IRIS_HFI_GEN1_H__
struct iris_core;
struct iris_inst;
void iris_hfi_gen1_sys_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

32
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c
View File

@ -1076,21 +1076,7 @@ static const struct iris_hfi_session_ops iris_hfi_gen1_session_ops = {
.session_close = iris_hfi_gen1_session_close,
};
static const struct iris_hfi_sys_ops iris_hfi_gen1_sys_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,
.sys_hfi_response_handler = iris_hfi_gen1_response_handler,
};
void iris_hfi_gen1_sys_ops_init(struct iris_core *core)
{
core->hfi_sys_ops = &iris_hfi_gen1_sys_ops;
}
struct iris_inst *iris_hfi_gen1_get_instance(void)
static struct iris_inst *iris_hfi_gen1_get_instance(void)
{
struct iris_inst *out;
@ -1102,3 +1088,19 @@ struct iris_inst *iris_hfi_gen1_get_instance(void)
return out;
}
static const struct iris_hfi_sys_ops iris_hfi_gen1_sys_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,
.sys_hfi_response_handler = iris_hfi_gen1_response_handler,
.sys_get_instance = iris_hfi_gen1_get_instance,
};
void iris_hfi_gen1_sys_ops_init(struct iris_core *core)
{
core->hfi_sys_ops = &iris_hfi_gen1_sys_ops;
}

1
drivers/media/platform/qcom/iris/iris_hfi_gen2.h
View File

@ -36,6 +36,5 @@ struct iris_inst_hfi_gen2 {
void iris_hfi_gen2_sys_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

32
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
View File

@ -1315,21 +1315,7 @@ static const struct iris_hfi_session_ops iris_hfi_gen2_session_ops = {
.session_close = iris_hfi_gen2_session_close,
};
static const struct iris_hfi_sys_ops iris_hfi_gen2_sys_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,
.sys_hfi_response_handler = iris_hfi_gen2_response_handler,
};
void iris_hfi_gen2_sys_ops_init(struct iris_core *core)
{
core->hfi_sys_ops = &iris_hfi_gen2_sys_ops;
}
struct iris_inst *iris_hfi_gen2_get_instance(void)
static struct iris_inst *iris_hfi_gen2_get_instance(void)
{
struct iris_inst_hfi_gen2 *out;
@ -1342,3 +1328,19 @@ struct iris_inst *iris_hfi_gen2_get_instance(void)
return &out->inst;
}
static const struct iris_hfi_sys_ops iris_hfi_gen2_sys_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,
.sys_hfi_response_handler = iris_hfi_gen2_response_handler,
.sys_get_instance = iris_hfi_gen2_get_instance,
};
void iris_hfi_gen2_sys_ops_init(struct iris_core *core)
{
core->hfi_sys_ops = &iris_hfi_gen2_sys_ops;
}

1
drivers/media/platform/qcom/iris/iris_platform_common.h
View File

@ -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;

2
drivers/media/platform/qcom/iris/iris_platform_gen1.c
View File

@ -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_sys_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_sys_ops_init,
.get_vpu_buffer_size = iris_vpu_buf_size,
.vpu_ops = &iris_vpu2_ops,

4
drivers/media/platform/qcom/iris/iris_platform_gen2.c
View File

@ -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_sys_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_sys_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_sys_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_sys_ops_init,
.get_vpu_buffer_size = iris_vpu_buf_size,
.vpu_ops = &iris_vpu3_ops,

2
drivers/media/platform/qcom/iris/iris_vidc.c
View File

@ -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;