media: qcom: iris: rework platform data handling
Subsystems (4)
v8 cover media: qcom: iris: rework platform data handling
Currently platform data for the iris devices contain a mixture of hadware and software description. This seems to work in simple cases, but as the driver matures, it leads to strange decisions.
For example, the recent series extending SC7280 support to be able to use HFI Gen2 firmware ended up duplicating SC7280 data, using SM8550-related structs even though the hardware hasn't changed.
Another example, SM8450 and SM8350 are also simiar cores (and similar to the existing SM8250), however SM8450 will have to go to the same file as VPU3 cores just because of the firmware interface.
Last, but not least, this leads to a lot of copy-paste duplicates between platforms, having similar firmware interfaces. It damages readability and complicates adding support for new platforms.
Rework Iris platform data, splitting it into hardware description (definied by the GPU core) and HFI Gen-related firmware data.
---
Changes in v8:
- Moved core_arch to iris_firmware_data (Dikshita)
- Made HW_RESPONSE_TIMEOUT_VALUE static (Vikash)
- Changed firmware name for SM8250
- Extracted firmware description interface (Dikshita)
- Link to v7: https://lore.kernel.org/r/[email protected]
Changes in v7:
- Fixed build error
- Link to v6: https://lore.kernel.org/r/[email protected]
Changes in v6:
- Moved get_vpu_buffer_size() back to iris_platform_data, it will be
handled separately, when adding support for Gen2 on Kodiak (Dikshita)
- Renamed iris_platform_vpu3.c to iris_platform_vpu3x.c (Dikshita)
- Renamed generic VPU2 and VPU3x constants to stop referencing SM8250
and SM8550 (Dikshita)
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- Added missing kerneldoc for struct iris_core (Dikshita)
- Dropped two more unused defines, leftovers from the split
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- Renamed iris_hfi_gen1_ops instances and related functions to contain
_sys_ (Dikshita)
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Dropped the config_params / subscription_params patches for now,
let's get more different platforms in first, determining the common
base and the best way to handle the differences.
- Dropped set_preset_registers callback, call
iris_vpu_set_preset_registers() directly (Dikshita)
- Renamed HFI ops to hfi_sys_ops and hfi_session_ops (Dikshita)
- Dropped (unused) hfi_response_ops from struct iris_core (Dikshita)
- Renamed hfi_response_handler and get_instance callbacks to follow
other hfi_sys_ops callbacks.
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Fixed build error in the interim patch, the fix sneaked to the wrong
patch in rebases.
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Dmitry Baryshkov (11):
media: qcom: iris: drop pas_id from the iris_platform_data struct
media: qcom: iris: use common set_preset_registers function
media: qcom: iris: don't use function indirection in gen2-specific code
media: qcom: iris: split HFI session ops from core ops
media: qcom: iris: merge hfi_response_ops and hfi_command_ops
media: qcom: iris: move get_instance to iris_hfi_sys_ops
media: qcom: iris: drop hw_response_timeout_val from platform data
media: qcom: iris: split firmware_data from raw platform data
media: qcom: iris: split platform data from firmware data
media: qcom: iris: use new firmware name for SM8250
media: qcom: iris: extract firmware description data
drivers/media/platform/qcom/iris/Makefile | 6 +-
drivers/media/platform/qcom/iris/iris_buffer.c | 88 ++---
drivers/media/platform/qcom/iris/iris_common.c | 8 +-
drivers/media/platform/qcom/iris/iris_core.c | 3 +-
drivers/media/platform/qcom/iris/iris_core.h | 9 +-
drivers/media/platform/qcom/iris/iris_ctrls.c | 54 +--
drivers/media/platform/qcom/iris/iris_firmware.c | 13 +-
drivers/media/platform/qcom/iris/iris_hfi_common.c | 6 +-
drivers/media/platform/qcom/iris/iris_hfi_common.h | 13 +-
.../iris/{iris_platform_gen1.c => iris_hfi_gen1.c} | 168 +--------
drivers/media/platform/qcom/iris/iris_hfi_gen1.h | 6 +-
.../platform/qcom/iris/iris_hfi_gen1_command.c | 43 ++-
.../platform/qcom/iris/iris_hfi_gen1_response.c | 11 +-
.../iris/{iris_platform_gen2.c => iris_hfi_gen2.c} | 413 +--------------------
drivers/media/platform/qcom/iris/iris_hfi_gen2.h | 5 +-
.../platform/qcom/iris/iris_hfi_gen2_command.c | 115 +++---
.../platform/qcom/iris/iris_hfi_gen2_response.c | 11 +-
drivers/media/platform/qcom/iris/iris_instance.h | 4 +
.../platform/qcom/iris/iris_platform_common.h | 95 +++--
.../platform/qcom/iris/iris_platform_sm8250.h | 29 ++
.../platform/qcom/iris/iris_platform_sm8550.h | 31 ++
.../media/platform/qcom/iris/iris_platform_vpu2.c | 132 +++++++
.../media/platform/qcom/iris/iris_platform_vpu3x.c | 219 +++++++++++
drivers/media/platform/qcom/iris/iris_probe.c | 5 +-
drivers/media/platform/qcom/iris/iris_utils.c | 5 +-
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 | 14 +-
drivers/media/platform/qcom/iris/iris_vpu_common.c | 11 +-
drivers/media/platform/qcom/iris/iris_vpu_common.h | 2 +
31 files changed, 703 insertions(+), 828 deletions(-)---
base-commit: 8e5a478b6d6a5bb0a3d52147862b15e4d826af19
change-id: 20260227-iris-platform-data-c5c80e84d1a7
prerequisite-change-id: 20251119-venus-iris-flip-switch-d59a3fbc6a4b:v4
prerequisite-patch-id: 615a763749fdc0c4ee184478bc64120972d8c7a1
prerequisite-patch-id: 6d85e3db422bc7f16246249288a17b92f6edbc09
prerequisite-patch-id: 579d712ec3f942ba0c362e242c71361c151092b5
prerequisite-patch-id: fa4629a3909fbae3917d8c067cce4f673ee857c0
prerequisite-patch-id: cbbd40736f7a797ff76b0fe2b1ddfb559e14e666
prerequisite-patch-id: 5b50917dcfef01db13af320cbd1cba15fd5fa16f
prerequisite-change-id: 20260110-iris-ubwc-06f64cbb31ae:v4
prerequisite-patch-id: 258496117b2e498200190910a37776be2ced6382
prerequisite-patch-id: 50f58e5d9c6cd2b520d17a7e7b2e657faa7d0847
prerequisite-patch-id: af2ff44a7b919da2ee06cc40893fbcd3f65d32f7
prerequisite-patch-id: f3a2b9ef97be3fa250ea0a6467b2d5a782315aa5
prerequisite-patch-id: 6bdd2119448e84aacbdc6a54d999d47fc69dac81
prerequisite-patch-id: 38cc9502c93c71324f1a11a1fd438374fc41ca84
prerequisite-patch-id: 059d1f35274246575ca4fa9b4ee33cd4801479d1
prerequisite-patch-id: 1cf4ea774a145cdba617eb8be5c1f7afe5817772
prerequisite-patch-id: 46375dcd0da4629e6031336351b9cf688691d7c5
prerequisite-change-id: 20260131-iris-venus-fix-sm8250-f938e29e7497:v5
prerequisite-patch-id: 6d85e3db422bc7f16246249288a17b92f6edbc09
prerequisite-patch-id: 579d712ec3f942ba0c362e242c71361c151092b5
prerequisite-patch-id: fa4629a3909fbae3917d8c067cce4f673ee857c0
prerequisite-patch-id: cbbd40736f7a797ff76b0fe2b1ddfb559e14e666
prerequisite-patch-id: 5b50917dcfef01db13af320cbd1cba15fd5fa16f
prerequisite-patch-id: 8948139735836adb9fbc51d93b969911dc5b38e8
prerequisite-patch-id: 7ec91bd0149f347c479c906e73cabaa28601ab3d
prerequisite-patch-id: c711522b63f640b7504767b3af7adc05a0b36cac
prerequisite-patch-id: 42b9cd5e0fd6fd99eae267c78b239333adff7637
prerequisite-patch-id: 11c487545e2462ff0a515d689863c3f7f25f9449
Best regards,
Signature · 2 lines
With best wishes Dmitry
PATCH v8 1/11 media: qcom: iris: drop pas_id from the iris_platform_data struct
The PAS ID, the authentication service ID, used by the Iris is a constant and it is not expected to change anytime. Drop it from the platform data and use the constant instead.
--- drivers/media/platform/qcom/iris/iris_firmware.c | 11 ++++++----- drivers/media/platform/qcom/iris/iris_platform_common.h | 2 -- drivers/media/platform/qcom/iris/iris_platform_gen1.c | 2 -- drivers/media/platform/qcom/iris/iris_platform_gen2.c | 4 ---- 4 files changed, 6 insertions(+), 13 deletions(-)
drivers/media/platform/qcom/iris/iris_firmware.c +6 -5
@@ -12,11 +12,12 @@#include "iris_core.h" #include "iris_firmware.h" +#define IRIS_PAS_ID 9 +#define MAX_FIRMWARE_NAME_SIZE 128static int iris_load_fw_to_memory (struct iris_core *core,const char *fw_name) { -u32 pas_id = core->iris_platform_data->pas_id;const struct firmware *firmware =NULL ;struct device *dev = core->dev;struct resource res;
@@ -53,7 +54,7 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name) } ret =qcom_mdt_load (dev, firmware, fw_name, - pas_id, mem_virt, mem_phys, res_size,NULL ); +IRIS_PAS_ID , mem_virt, mem_phys, res_size,NULL );memunmap (mem_virt); err_release_fw:
@@ -79,7 +80,7 @@ int iris_fw_load(struct iris_core *core)return -ENOMEM ; } - ret =qcom_scm_pas_auth_and_reset (core->iris_platform_data->pas_id); + ret =qcom_scm_pas_auth_and_reset (IRIS_PAS_ID );if (ret) {dev_err (core->dev,"auth and reset failed: %d\n" , ret);return ret;
@@ -93,7 +94,7 @@ int iris_fw_load(struct iris_core *core) cp_config->cp_nonpixel_size);if (ret) {dev_err (core->dev,"qcom_scm_mem_protect_video_var failed: %d\n" , ret); -qcom_scm_pas_shutdown (core->iris_platform_data->pas_id); +qcom_scm_pas_shutdown (IRIS_PAS_ID );return ret; } }
@@ -103,7 +104,7 @@ int iris_fw_load(struct iris_core *core)int iris_fw_unload (struct iris_core *core) { -return qcom_scm_pas_shutdown (core->iris_platform_data->pas_id); +return qcom_scm_pas_shutdown (IRIS_PAS_ID ); }int iris_set_hw_state (struct iris_core *core,bool resume)
drivers/media/platform/qcom/iris/iris_platform_common.h +0 -2
@@ -12,7 +12,6 @@struct iris_core ;struct iris_inst ; -#define IRIS_PAS_ID 9#define HW_RESPONSE_TIMEOUT_VALUE (1000)/* milliseconds */ #define AUTOSUSPEND_DELAY_VALUE (HW_RESPONSE_TIMEOUT_VALUE + 500)/* milliseconds */
@@ -226,7 +225,6 @@ struct iris_platform_data {unsigned int controller_rst_tbl_size;u64 dma_mask;const char *fwname; -u32 pas_id;struct iris_fmt *inst_iris_fmts;u32 inst_iris_fmts_size;struct platform_inst_caps *inst_caps;
drivers/media/platform/qcom/iris/iris_platform_gen1.c +0 -2
@@ -360,7 +360,6 @@ const struct iris_platform_data sm8250_data = {/* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu-1.0/venus.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8250_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8250_dec), .inst_caps = &platform_inst_cap_sm8250,
@@ -413,7 +412,6 @@ const struct iris_platform_data sc7280_data = {/* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu20_p1.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8250_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8250_dec), .inst_caps = &platform_inst_cap_sm8250,
drivers/media/platform/qcom/iris/iris_platform_gen2.c +0 -4
@@ -934,7 +934,6 @@ const struct iris_platform_data sm8550_data = {/* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu30_p4.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8550_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps = &platform_inst_cap_sm8550,
@@ -1038,7 +1037,6 @@ const struct iris_platform_data sm8650_data = {/* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu33_p4.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8550_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps = &platform_inst_cap_sm8550,
@@ -1133,7 +1131,6 @@ const struct iris_platform_data sm8750_data = {/* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu35_p4.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8550_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps = &platform_inst_cap_sm8550,
@@ -1232,7 +1229,6 @@ const struct iris_platform_data qcs8300_data = {/* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu30_p4_s6.mbn", - .pas_id = IRIS_PAS_ID, .inst_iris_fmts = platform_fmts_sm8550_dec, .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps = &platform_inst_cap_qcs8300,
Signature · 1 line
2.47.3
Vikash Garodia
maintainerRe: [PATCH v8 01/11] media: qcom: iris: drop pas_id from the iris_platform_data struct
Quoted 7 lines · Dmitry Baryshkov
The PAS ID, the authentication service ID, used by the Iris is a constant and it is not expected to change anytime. Drop it from the platform data and use the constant instead.
Reviewed-by Dikshita Agarwal<[email protected]>Reviewed-by Konrad Dybcio<[email protected]>Signed-off-by Dmitry Baryshkov<[email protected]>
b4 trailers -u ?
Regards,
Vikash
Re: [PATCH v8 01/11] media: qcom: iris: drop pas_id from the iris_platform_data struct
Quoted 11 lines · Vikash Garodia
Quoted 7 lines · Dmitry Baryshkov
The PAS ID, the authentication service ID, used by the Iris is a constant and it is not expected to change anytime. Drop it from the platform data and use the constant instead.
Reviewed-by Dikshita Agarwal<[email protected]>Reviewed-by Konrad Dybcio<[email protected]>Signed-off-by Dmitry Baryshkov<[email protected]>b4 trailers -u ?
Sorry
Quoted 4 lines
Regards,
Vikash
Signature · 2 lines
With best wishes Dmitry
PATCH v8 2/11 media: qcom: iris: use common set_preset_registers function
In reply to Dmitry BaryshkovThe set_preset_registers is (currently) common to all supported devices. Extract it to a iris_vpu_common.c and call it directly from iris_vpu_power_on(). Later, if any of the devices requires special handling, it can be sorted out separately.
--- drivers/media/platform/qcom/iris/iris_platform_common.h | 1 - drivers/media/platform/qcom/iris/iris_platform_gen1.c | 7 ------- drivers/media/platform/qcom/iris/iris_platform_gen2.c | 9 --------- drivers/media/platform/qcom/iris/iris_vpu_common.c | 7 ++++++- drivers/media/platform/qcom/iris/iris_vpu_common.h | 2 ++ 5 files changed, 8 insertions(+), 18 deletions(-)
drivers/media/platform/qcom/iris/iris_platform_common.h +0 -1
@@ -207,7 +207,6 @@ struct iris_platform_data {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; -void (*set_preset_registers)(struct iris_core *core);const struct icc_info *icc_tbl;unsigned int icc_tbl_size;const struct bw_info *bw_tbl_dec;
drivers/media/platform/qcom/iris/iris_platform_gen1.c +0 -7
@@ -260,11 +260,6 @@ static struct platform_inst_caps platform_inst_cap_sm8250 = { .max_operating_rate = MAXIMUM_FPS, }; -static void iris_set_sm8250_preset_registers (struct iris_core *core) -{ -writel (0x0 , core->reg_base +0xB0088 ); -} -static const struct icc_info sm8250_icc_table[] = { {"cpu-cfg" ,1000 ,1000 }, {"video-mem" ,1000 ,15000000 },
@@ -343,7 +338,6 @@ const struct iris_platform_data sm8250_data = { .init_hfi_response_ops = iris_hfi_gen1_response_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu2_ops, - .set_preset_registers = iris_set_sm8250_preset_registers, .icc_tbl = sm8250_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8250_icc_table), .clk_rst_tbl = sm8250_clk_reset_table,
@@ -397,7 +391,6 @@ const struct iris_platform_data sc7280_data = { .init_hfi_response_ops = iris_hfi_gen1_response_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu2_ops, - .set_preset_registers = iris_set_sm8250_preset_registers, .icc_tbl = sm8250_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8250_icc_table), .bw_tbl_dec = sc7280_bw_table_dec,
drivers/media/platform/qcom/iris/iris_platform_gen2.c +0 -9
@@ -756,11 +756,6 @@ static struct platform_inst_caps platform_inst_cap_sm8550 = { .max_operating_rate = MAXIMUM_FPS, }; -static void iris_set_sm8550_preset_registers (struct iris_core *core) -{ -writel (0x0 , core->reg_base +0xB0088 ); -} -static const struct icc_info sm8550_icc_table[] = { {"cpu-cfg" ,1000 ,1000 }, {"video-mem" ,1000 ,15000000 },
@@ -917,7 +912,6 @@ const struct iris_platform_data sm8550_data = { .init_hfi_response_ops = iris_hfi_gen2_response_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu3_ops, - .set_preset_registers = iris_set_sm8550_preset_registers, .icc_tbl = sm8550_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table), .clk_rst_tbl = sm8550_clk_reset_table,
@@ -1018,7 +1012,6 @@ const struct iris_platform_data sm8650_data = { .init_hfi_response_ops = iris_hfi_gen2_response_ops_init, .get_vpu_buffer_size = iris_vpu33_buf_size, .vpu_ops = &iris_vpu33_ops, - .set_preset_registers = iris_set_sm8550_preset_registers, .icc_tbl = sm8550_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table), .clk_rst_tbl = sm8650_clk_reset_table,
@@ -1114,7 +1107,6 @@ const struct iris_platform_data sm8750_data = { .init_hfi_response_ops = iris_hfi_gen2_response_ops_init, .get_vpu_buffer_size = iris_vpu33_buf_size, .vpu_ops = &iris_vpu35_ops, - .set_preset_registers = iris_set_sm8550_preset_registers, .icc_tbl = sm8550_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table), .clk_rst_tbl = sm8750_clk_reset_table,
@@ -1212,7 +1204,6 @@ const struct iris_platform_data qcs8300_data = { .init_hfi_response_ops = iris_hfi_gen2_response_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu3_ops, - .set_preset_registers = iris_set_sm8550_preset_registers, .icc_tbl = sm8550_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table), .clk_rst_tbl = sm8550_clk_reset_table,
drivers/media/platform/qcom/iris/iris_vpu_common.c +6 -1
@@ -468,7 +468,7 @@ int iris_vpu_power_on(struct iris_core *core)iris_opp_set_rate (core->dev, freq); - core->iris_platform_data->set_preset_registers (core); +iris_vpu_set_preset_registers (core);iris_vpu_interrupt_init (core); core->intr_status =0 ;
@@ -485,3 +485,8 @@ int iris_vpu_power_on(struct iris_core *core)return ret; } + +void iris_vpu_set_preset_registers (struct iris_core *core) +{ +writel (0x0 , core->reg_base +0xb0088 ); +}
drivers/media/platform/qcom/iris/iris_vpu_common.h +2 -0
@@ -39,4 +39,6 @@ int iris_vpu35_vpu4x_power_on_controller(struct iris_core *core);void iris_vpu35_vpu4x_program_bootup_registers (struct iris_core *core);u64 iris_vpu3x_vpu4x_calculate_frequency (struct iris_inst *inst,size_t data_size); +void iris_vpu_set_preset_registers (struct iris_core *core); +#endif
Signature · 1 line
2.47.3
PATCH v8 3/11 media: qcom: iris: don't use function indirection in gen2-specific code
In reply to Dmitry BaryshkovTo note that iris_set_num_comv() is gen2-internal, rename it to iris_hfi_gen2_set_num_comv() and then stop using hfi_ops indirection to set session property (like other functions in this file do).
--- drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +8 -8
@@ -1205,7 +1205,7 @@ static u32 iris_hfi_gen2_buf_type_from_driver(u32 domain, enum iris_buffer_type } } -static int iris_set_num_comv (struct iris_inst *inst) +static int iris_hfi_gen2_set_num_comv (struct iris_inst *inst) {struct platform_inst_caps *caps;struct iris_core *core = inst->core;
@@ -1220,12 +1220,12 @@ static int iris_set_num_comv(struct iris_inst *inst) num_comv = (inst->codec ==V4L2_PIX_FMT_AV1 ) ?NUM_COMV_AV1 : caps->num_comv; -return core->hfi_ops->session_set_property (inst, -HFI_PROP_COMV_BUFFER_COUNT , -HFI_HOST_FLAGS_NONE , -HFI_PORT_BITSTREAM , -HFI_PAYLOAD_U32 , - &num_comv,sizeof (u32)); +return iris_hfi_gen2_session_set_property (inst, +HFI_PROP_COMV_BUFFER_COUNT , +HFI_HOST_FLAGS_NONE , +HFI_PORT_BITSTREAM , +HFI_PAYLOAD_U32 , + &num_comv,sizeof (u32)); } static void iris_hfi_gen2_get_buffer(u32 domain, struct iris_buffer *buffer,
@@ -1257,7 +1257,7 @@ static int iris_hfi_gen2_session_queue_buffer(struct iris_inst *inst, struct iriiris_hfi_gen2_get_buffer (inst->domain, buffer, &hfi_buffer);if (buffer->type ==BUF_COMV ) { - ret =iris_set_num_comv (inst); + ret =iris_hfi_gen2_set_num_comv (inst);if (ret)return ret; }
Signature · 1 line
2.47.3
PATCH v8 4/11 media: qcom: iris: split HFI session ops from core ops
In reply to Dmitry BaryshkovCalling 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.
--- 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(-)
drivers/media/platform/qcom/iris/iris_buffer.c +2 -2
@@ -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_session_ops *hfi_ops = inst->hfi_session_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_session_ops *hfi_ops = inst->hfi_session_ops;struct iris_buffers *buffers = &inst->buffers[buffer_type];struct iris_buffer *buffer, *next;int ret;
drivers/media/platform/qcom/iris/iris_common.c +4 -4
@@ -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_session_ops *hfi_ops = inst->hfi_session_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_session_ops *hfi_ops = inst->hfi_session_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_session_ops *hfi_ops = inst->hfi_session_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_session_ops *hfi_ops = inst->hfi_session_ops;enum iris_buffer_type buffer_type;int ret;
drivers/media/platform/qcom/iris/iris_ctrls.c +23 -23
184 lines not on this page · raw message
drivers/media/platform/qcom/iris/iris_hfi_common.h +3 -0
@@ -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_session_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,
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +17 -6
@@ -1063,11 +1063,7 @@ static int iris_hfi_gen1_session_set_config_params(struct iris_inst *inst, u32 preturn 0 ; } -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_session_ops iris_hfi_gen1_session_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,
@@ -1080,6 +1076,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;
@@ -1087,5 +1090,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_session_ops = &iris_hfi_gen1_session_ops; + +return out; }
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +12 -5
@@ -1300,11 +1300,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_session_ops iris_hfi_gen2_session_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,
@@ -1319,6 +1315,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;
@@ -1330,6 +1333,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_session_ops = &iris_hfi_gen2_session_ops;return &out->inst; }
drivers/media/platform/qcom/iris/iris_instance.h +4 -0
@@ -15,6 +15,8 @@#define DEFAULT_WIDTH 320#define DEFAULT_HEIGHT 240 +struct iris_hfi_session_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_session_ops: iris HFI session 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_session_ops *hfi_session_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;
drivers/media/platform/qcom/iris/iris_vb2.c +1 -1
@@ -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_session_ops->session_open (inst);if (ret) { ret = -EINVAL ;dev_err (core->dev,"session open failed\n" );
drivers/media/platform/qcom/iris/iris_vdec.c +3 -3
@@ -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_session_ops *hfi_ops = inst->hfi_session_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_session_ops *hfi_ops = inst->hfi_session_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_session_ops *hfi_ops = inst->hfi_session_ops;int ret; ret = hfi_ops->session_drain (inst,V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE );
drivers/media/platform/qcom/iris/iris_venc.c +2 -2
@@ -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_session_ops *hfi_ops = inst->hfi_session_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_session_ops *hfi_ops = inst->hfi_session_ops;int ret; ret = hfi_ops->session_drain (inst,V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE );
drivers/media/platform/qcom/iris/iris_vidc.c +1 -1
@@ -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_session_ops *hfi_ops = inst->hfi_session_ops;bool wait_for_response = true;int ret;
Signature · 1 line
2.47.3
PATCH v8 5/11 media: qcom: iris: merge hfi_response_ops and hfi_command_ops
In reply to Dmitry BaryshkovThere is little point in having two different structures for HFI-related core ops. Merge both of them into the new iris_hfi_ops structure.
--- drivers/media/platform/qcom/iris/iris_core.h | 6 ++---- 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 +-- drivers/media/platform/qcom/iris/iris_vpu_common.c | 2 +- 14 files changed, 33 insertions(+), 59 deletions(-)
drivers/media/platform/qcom/iris/iris_core.h +2 -4
@@ -68,8 +68,7 @@ struct qcom_ubwc_cfg_data;* @header_id: id of packet header * @packet_id: id of packet * @power: a structure for clock and bw information -* @hfi_ops: iris hfi command ops -* @hfi_response_ops: iris hfi response ops +* @hfi_sys_ops: iris HFI system ops * @core_init_done: structure of signal completion for system response * @intr_status: interrupt status * @sys_error_handler: a delayed work for handling system fatal error
@@ -112,8 +111,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_response_ops *hfi_response_ops; +const struct iris_hfi_sys_ops *hfi_sys_ops;struct completion core_init_done;u32 intr_status;struct delayed_work sys_error_handler;
drivers/media/platform/qcom/iris/iris_hfi_common.c +3 -3
@@ -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_sys_ops *hfi_ops = core->hfi_sys_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_sys_ops->sys_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_sys_ops *ops = core->hfi_sys_ops;int ret; ret =iris_vpu_power_on (core);
drivers/media/platform/qcom/iris/iris_hfi_common.h +3 -5
@@ -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_sys_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 (*sys_hfi_response_handler)(struct iris_core *core); };struct iris_hfi_session_ops {
@@ -129,10 +131,6 @@ struct iris_hfi_session_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 ];
drivers/media/platform/qcom/iris/iris_hfi_gen1.h +2 -2
@@ -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_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
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +5 -3
@@ -1076,16 +1076,18 @@ static const struct iris_hfi_session_ops iris_hfi_gen1_session_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_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_command_ops_init (struct iris_core *core) +void iris_hfi_gen1_sys_ops_init (struct iris_core *core) { - core->hfi_ops = &iris_hfi_gen1_command_ops; + core->hfi_sys_ops = &iris_hfi_gen1_sys_ops; }struct iris_inst *iris_hfi_gen1_get_instance (void )
drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c +1 -10
@@ -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; -}
drivers/media/platform/qcom/iris/iris_hfi_gen2.h +2 -2
@@ -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_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
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +5 -3
@@ -1315,16 +1315,18 @@ static const struct iris_hfi_session_ops iris_hfi_gen2_session_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_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_command_ops_init (struct iris_core *core) +void iris_hfi_gen2_sys_ops_init (struct iris_core *core) { - core->hfi_ops = &iris_hfi_gen2_command_ops; + core->hfi_sys_ops = &iris_hfi_gen2_sys_ops; }struct iris_inst *iris_hfi_gen2_get_instance (void )
drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c +1 -10
@@ -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; -}
drivers/media/platform/qcom/iris/iris_platform_common.h +1 -2
@@ -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;
drivers/media/platform/qcom/iris/iris_platform_gen1.c +2 -4
@@ -334,8 +334,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_sys_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu2_ops, .icc_tbl = sm8250_icc_table,
@@ -387,8 +386,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_sys_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu2_ops, .icc_tbl = sm8250_icc_table,
drivers/media/platform/qcom/iris/iris_platform_gen2.c +4 -8
@@ -908,8 +908,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_sys_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu3_ops, .icc_tbl = sm8550_icc_table,
@@ -1008,8 +1007,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_sys_ops_init, .get_vpu_buffer_size = iris_vpu33_buf_size, .vpu_ops = &iris_vpu33_ops, .icc_tbl = sm8550_icc_table,
@@ -1103,8 +1101,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_sys_ops_init, .get_vpu_buffer_size = iris_vpu33_buf_size, .vpu_ops = &iris_vpu35_ops, .icc_tbl = sm8550_icc_table,
@@ -1200,8 +1197,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_sys_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu3_ops, .icc_tbl = sm8550_icc_table,
drivers/media/platform/qcom/iris/iris_probe.c +1 -2
@@ -264,8 +264,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)
drivers/media/platform/qcom/iris/iris_vpu_common.c +1 -1
@@ -149,7 +149,7 @@ int iris_vpu_prepare_pc(struct iris_core *core)if (!wfi_status || !idle_status) goto skip_power_off; - ret = core->hfi_ops->sys_pc_prep (core); + ret = core->hfi_sys_ops->sys_pc_prep (core);if (ret) goto skip_power_off;
Signature · 1 line
2.47.3
PATCH v8 6/11 media: qcom: iris: move get_instance to iris_hfi_sys_ops
In reply to Dmitry BaryshkovThe 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.
--- 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(-)
drivers/media/platform/qcom/iris/iris_hfi_common.h +2 -0
@@ -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 {
drivers/media/platform/qcom/iris/iris_hfi_gen1.h +0 -2
@@ -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
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +15 -13
@@ -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_sys_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_sys_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_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 ) -{ -struct iris_inst *out; - - out =kzalloc_obj (*out); -if (!out) -return NULL ; - - out->hfi_session_ops = &iris_hfi_gen1_session_ops; - -return out; -}
drivers/media/platform/qcom/iris/iris_hfi_gen2.h +0 -1
@@ -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
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +16 -14
@@ -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_sys_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_sys_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_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 ) -{ -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; -}
drivers/media/platform/qcom/iris/iris_platform_common.h +0 -1
@@ -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;
drivers/media/platform/qcom/iris/iris_platform_gen1.c +0 -2
@@ -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,
drivers/media/platform/qcom/iris/iris_platform_gen2.c +0 -4
@@ -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,
drivers/media/platform/qcom/iris/iris_vidc.c +1 -1
@@ -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 ;
Signature · 1 line
2.47.3
PATCH v8 7/11 media: qcom: iris: drop hw_response_timeout_val from platform data
In reply to Dmitry BaryshkovThe HW response time is a constant between platforms. Remove it from the iris_platform_data structure and use it directly.
--- drivers/media/platform/qcom/iris/iris_core.c | 3 +-- drivers/media/platform/qcom/iris/iris_platform_common.h | 1 - drivers/media/platform/qcom/iris/iris_platform_gen1.c | 2 -- drivers/media/platform/qcom/iris/iris_platform_gen2.c | 4 ---- drivers/media/platform/qcom/iris/iris_utils.c | 5 +---- 5 files changed, 2 insertions(+), 13 deletions(-)
drivers/media/platform/qcom/iris/iris_core.c +1 -2
@@ -28,14 +28,13 @@ void iris_core_deinit(struct iris_core *core)static int iris_wait_for_system_response (struct iris_core *core) { -u32 hw_response_timeout_val = core->iris_platform_data->hw_response_timeout;int ret;if (core->state ==IRIS_CORE_ERROR )return -EIO ; ret =wait_for_completion_timeout (&core->core_init_done, -msecs_to_jiffies (hw_response_timeout_val)); +msecs_to_jiffies (HW_RESPONSE_TIMEOUT_VALUE ));if (!ret) { core->state =IRIS_CORE_ERROR ;return -ETIMEDOUT ;
drivers/media/platform/qcom/iris/iris_platform_common.h +0 -1
@@ -232,7 +232,6 @@ struct iris_platform_data {const struct tz_cp_config *tz_cp_config_data;u32 tz_cp_config_data_size;u32 core_arch; -u32 hw_response_timeout;u32 num_vpp_pipe;bool no_aon;u32 max_session_count;
drivers/media/platform/qcom/iris/iris_platform_gen1.c +0 -2
@@ -361,7 +361,6 @@ const struct iris_platform_data sm8250_data = { .inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_sm8250_enc), .tz_cp_config_data = tz_cp_config_sm8250, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8250), - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 4, .max_session_count = 16, .max_core_mbpf = NUM_MBS_8K,
@@ -410,7 +409,6 @@ const struct iris_platform_data sc7280_data = { .inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_sm8250_enc), .tz_cp_config_data = tz_cp_config_sm8250, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8250), - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 1, .no_aon = true, .max_session_count = 16,
drivers/media/platform/qcom/iris/iris_platform_gen2.c +0 -4
@@ -936,7 +936,6 @@ const struct iris_platform_data sm8550_data = { .tz_cp_config_data = tz_cp_config_sm8550, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8550), .core_arch = VIDEO_ARCH_LX, - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 4, .max_session_count = 16, .max_core_mbpf = NUM_MBS_8K * 2,
@@ -1036,7 +1035,6 @@ const struct iris_platform_data sm8650_data = { .tz_cp_config_data = tz_cp_config_sm8550, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8550), .core_arch = VIDEO_ARCH_LX, - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 4, .max_session_count = 16, .max_core_mbpf = NUM_MBS_8K * 2,
@@ -1127,7 +1125,6 @@ const struct iris_platform_data sm8750_data = { .tz_cp_config_data = tz_cp_config_sm8550, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8550), .core_arch = VIDEO_ARCH_LX, - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 4, .max_session_count = 16, .max_core_mbpf = NUM_MBS_8K * 2,
@@ -1222,7 +1219,6 @@ const struct iris_platform_data qcs8300_data = { .tz_cp_config_data = tz_cp_config_sm8550, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8550), .core_arch = VIDEO_ARCH_LX, - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 2, .max_session_count = 16, .max_core_mbpf = ((4096 * 2176) / 256) * 4,
drivers/media/platform/qcom/iris/iris_utils.c +1 -4
@@ -55,16 +55,13 @@ void iris_helper_buffers_done(struct iris_inst *inst, unsigned int type,int iris_wait_for_session_response (struct iris_inst *inst,bool is_flush) { -struct iris_core *core = inst->core; -u32 hw_response_timeout_val;struct completion *done;int ret; - hw_response_timeout_val = core->iris_platform_data->hw_response_timeout; done = is_flush ? &inst->flush_completion : &inst->completion;mutex_unlock (&inst->lock); - ret =wait_for_completion_timeout (done,msecs_to_jiffies (hw_response_timeout_val)); + ret =wait_for_completion_timeout (done,msecs_to_jiffies (HW_RESPONSE_TIMEOUT_VALUE ));mutex_lock (&inst->lock);if (!ret) {iris_inst_change_state (inst,IRIS_INST_ERROR );
Signature · 1 line
2.47.3
Re: [PATCH v8 07/11] media: qcom: iris: drop hw_response_timeout_val from platform data
Quoted 6 lines · Dmitry Baryshkov
The HW response time is a constant between platforms. Remove it from the
iris_platform_datastructure and use it directly.Suggested-by Vikash Garodia<[email protected]>Signed-off-by Dmitry Baryshkov<[email protected]>---
Re: [PATCH v8 07/11] media: qcom: iris: drop hw_response_timeout_val from platform data
In reply to Dmitry BaryshkovQuoted 114 lines · Dmitry Baryshkov
The HW response time is a constant between platforms. Remove it from the
iris_platform_datastructure and use it directly.Suggested-by Vikash Garodia <[email protected]>Signed-off-by Dmitry Baryshkov <[email protected]>--- drivers/media/platform/qcom/iris/iris_core.c | 3 +-- drivers/media/platform/qcom/iris/iris_platform_common.h | 1 - drivers/media/platform/qcom/iris/iris_platform_gen1.c | 2 -- drivers/media/platform/qcom/iris/iris_platform_gen2.c | 4 ---- drivers/media/platform/qcom/iris/iris_utils.c | 5 +---- 5 files changed, 2 insertions(+), 13 deletions(-)drivers/media/platform/qcom/iris/iris_core.c +1
-2@@ -28,14 +28,13 @@ void iris_core_deinit(struct iris_core *core)static int iris_wait_for_system_response (struct iris_core *core) { -u32 hw_response_timeout_val = core->iris_platform_data->hw_response_timeout;int ret;if (core->state ==IRIS_CORE_ERROR )return -EIO ; ret =wait_for_completion_timeout (&core->core_init_done, -msecs_to_jiffies (hw_response_timeout_val)); +msecs_to_jiffies (HW_RESPONSE_TIMEOUT_VALUE ));if (!ret) { core->state =IRIS_CORE_ERROR ;return -ETIMEDOUT ;drivers/media/platform/qcom/iris/iris_platform_common.h +0
-1@@ -232,7 +232,6 @@ struct iris_platform_data {const struct tz_cp_config *tz_cp_config_data;u32 tz_cp_config_data_size;u32 core_arch; -u32 hw_response_timeout;u32 num_vpp_pipe;bool no_aon;u32 max_session_count;drivers/media/platform/qcom/iris/iris_platform_gen1.c +0
-2@@ -361,7 +361,6 @@ const struct iris_platform_data sm8250_data = { .inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_sm8250_enc), .tz_cp_config_data = tz_cp_config_sm8250, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8250), - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 4, .max_session_count = 16, .max_core_mbpf = NUM_MBS_8K,@@ -410,7 +409,6 @@ const struct iris_platform_data sc7280_data = { .inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_sm8250_enc), .tz_cp_config_data = tz_cp_config_sm8250, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8250), - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 1, .no_aon = true, .max_session_count = 16,drivers/media/platform/qcom/iris/iris_platform_gen2.c +0
-4@@ -936,7 +936,6 @@ const struct iris_platform_data sm8550_data = { .tz_cp_config_data = tz_cp_config_sm8550, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8550), .core_arch = VIDEO_ARCH_LX, - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 4, .max_session_count = 16, .max_core_mbpf = NUM_MBS_8K * 2,@@ -1036,7 +1035,6 @@ const struct iris_platform_data sm8650_data = { .tz_cp_config_data = tz_cp_config_sm8550, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8550), .core_arch = VIDEO_ARCH_LX, - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 4, .max_session_count = 16, .max_core_mbpf = NUM_MBS_8K * 2,@@ -1127,7 +1125,6 @@ const struct iris_platform_data sm8750_data = { .tz_cp_config_data = tz_cp_config_sm8550, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8550), .core_arch = VIDEO_ARCH_LX, - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 4, .max_session_count = 16, .max_core_mbpf = NUM_MBS_8K * 2,@@ -1222,7 +1219,6 @@ const struct iris_platform_data qcs8300_data = { .tz_cp_config_data = tz_cp_config_sm8550, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_sm8550), .core_arch = VIDEO_ARCH_LX, - .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, .num_vpp_pipe = 2, .max_session_count = 16, .max_core_mbpf = ((4096 * 2176) / 256) * 4,drivers/media/platform/qcom/iris/iris_utils.c +0
-2@@ -55,16 +55,13 @@ void iris_helper_buffers_done(struct iris_inst *inst, unsigned int type,int iris_wait_for_session_response (struct iris_inst *inst,bool is_flush) { -struct iris_core *core = inst->core; -u32 hw_response_timeout_val;struct completion *done;int ret;
drivers/media/platform/qcom/iris/iris_utils.c void iris_helper_buffers_done(struct iris_inst *inst, unsigned int type, · line 67
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_utils.c +1
-2- hw_response_timeout_val = core->iris_platform_data->hw_response_timeout; done = is_flush ? &inst->flush_completion : &inst->completion;mutex_unlock (&inst->lock); - ret =wait_for_completion_timeout (done,msecs_to_jiffies (hw_response_timeout_val)); + ret =wait_for_completion_timeout (done,msecs_to_jiffies (HW_RESPONSE_TIMEOUT_VALUE ));mutex_lock (&inst->lock);if (!ret) {iris_inst_change_state (inst,IRIS_INST_ERROR );
Thanks,
Dikshita
PATCH v8 8/11 media: qcom: iris: split firmware_data from raw platform data
In reply to Dmitry BaryshkovHaving firmware-related fields in platform data results in the tying platform data to the HFI firmware data rather than the actual hardware. For example, SM8450 uses Gen2 firmware, so currently its platform data should be placed next to the other gen2 platforms, although it has the VPU2.0 core, similar to the one found on SM8250 and SC7280 and so the hardware-specific platform data is also close to those devices.
Split firmware data to a separate struct, separating hardware-related data from the firmware interfaces.
--- drivers/media/platform/qcom/iris/iris_buffer.c | 82 +++---- drivers/media/platform/qcom/iris/iris_core.h | 2 + drivers/media/platform/qcom/iris/iris_ctrls.c | 8 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 8 +- .../platform/qcom/iris/iris_hfi_gen2_command.c | 66 +++--- .../platform/qcom/iris/iris_platform_common.h | 81 ++++--- .../media/platform/qcom/iris/iris_platform_gen1.c | 67 +++--- .../media/platform/qcom/iris/iris_platform_gen2.c | 248 ++++----------------- drivers/media/platform/qcom/iris/iris_probe.c | 3 +- drivers/media/platform/qcom/iris/iris_vidc.c | 10 +- drivers/media/platform/qcom/iris/iris_vpu_common.c | 2 +- 11 files changed, 206 insertions(+), 371 deletions(-)
drivers/media/platform/qcom/iris/iris_buffer.c +41 -41
@@ -301,31 +301,31 @@ static void iris_fill_internal_buf_info(struct iris_inst *inst,void iris_get_internal_buffers (struct iris_inst *inst,u32 plane) { -const struct iris_platform_data *platform_data = inst->core->iris_platform_data; +const struct iris_firmware_data *firmware_data = inst->core->iris_firmware_data;const u32 *internal_buf_type;u32 internal_buffer_count, i;if (inst->domain ==DECODER ) {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - internal_buffer_count = platform_data->dec_ip_int_buf_tbl_size; + internal_buf_type = firmware_data->dec_ip_int_buf_tbl; + internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size;for (i =0 ; i < internal_buffer_count; i++)iris_fill_internal_buf_info (inst, internal_buf_type[i]); }else { - internal_buf_type = platform_data->dec_op_int_buf_tbl; - internal_buffer_count = platform_data->dec_op_int_buf_tbl_size; + internal_buf_type = firmware_data->dec_op_int_buf_tbl; + internal_buffer_count = firmware_data->dec_op_int_buf_tbl_size;for (i =0 ; i < internal_buffer_count; i++)iris_fill_internal_buf_info (inst, internal_buf_type[i]); } }else {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; + internal_buf_type = firmware_data->enc_ip_int_buf_tbl; + internal_buffer_count = firmware_data->enc_ip_int_buf_tbl_size;for (i =0 ; i < internal_buffer_count; i++)iris_fill_internal_buf_info (inst, internal_buf_type[i]); }else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - internal_buffer_count = platform_data->enc_op_int_buf_tbl_size; + internal_buf_type = firmware_data->enc_op_int_buf_tbl; + internal_buffer_count = firmware_data->enc_op_int_buf_tbl_size;for (i =0 ; i < internal_buffer_count; i++)iris_fill_internal_buf_info (inst, internal_buf_type[i]); }
@@ -366,7 +366,7 @@ static int iris_create_internal_buffer(struct iris_inst *inst,int iris_create_internal_buffers (struct iris_inst *inst,u32 plane) { -const struct iris_platform_data *platform_data = inst->core->iris_platform_data; +const struct iris_firmware_data *firmware_data = inst->core->iris_firmware_data;u32 internal_buffer_count, i, j;struct iris_buffers *buffers;const u32 *internal_buf_type;
@@ -374,19 +374,19 @@ int iris_create_internal_buffers(struct iris_inst *inst, u32 plane)if (inst->domain ==DECODER ) {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - internal_buffer_count = platform_data->dec_ip_int_buf_tbl_size; + internal_buf_type = firmware_data->dec_ip_int_buf_tbl; + internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; }else { - internal_buf_type = platform_data->dec_op_int_buf_tbl; - internal_buffer_count = platform_data->dec_op_int_buf_tbl_size; + internal_buf_type = firmware_data->dec_op_int_buf_tbl; + internal_buffer_count = firmware_data->dec_op_int_buf_tbl_size; } }else {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; + internal_buf_type = firmware_data->enc_ip_int_buf_tbl; + internal_buffer_count = firmware_data->enc_ip_int_buf_tbl_size; }else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - internal_buffer_count = platform_data->enc_op_int_buf_tbl_size; + internal_buf_type = firmware_data->enc_op_int_buf_tbl; + internal_buffer_count = firmware_data->enc_op_int_buf_tbl_size; } }
@@ -442,7 +442,7 @@ int iris_queue_internal_deferred_buffers(struct iris_inst *inst, enum iris_buffeint iris_queue_internal_buffers (struct iris_inst *inst,u32 plane) { -const struct iris_platform_data *platform_data = inst->core->iris_platform_data; +const struct iris_firmware_data *firmware_data = inst->core->iris_firmware_data;struct iris_buffer *buffer, *next;struct iris_buffers *buffers;const u32 *internal_buf_type;
@@ -451,19 +451,19 @@ int iris_queue_internal_buffers(struct iris_inst *inst, u32 plane)if (inst->domain ==DECODER ) {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - internal_buffer_count = platform_data->dec_ip_int_buf_tbl_size; + internal_buf_type = firmware_data->dec_ip_int_buf_tbl; + internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; }else { - internal_buf_type = platform_data->dec_op_int_buf_tbl; - internal_buffer_count = platform_data->dec_op_int_buf_tbl_size; + internal_buf_type = firmware_data->dec_op_int_buf_tbl; + internal_buffer_count = firmware_data->dec_op_int_buf_tbl_size; } }else {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; + internal_buf_type = firmware_data->enc_ip_int_buf_tbl; + internal_buffer_count = firmware_data->enc_ip_int_buf_tbl_size; }else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - internal_buffer_count = platform_data->enc_op_int_buf_tbl_size; + internal_buf_type = firmware_data->enc_op_int_buf_tbl; + internal_buffer_count = firmware_data->enc_op_int_buf_tbl_size; } }
@@ -501,7 +501,7 @@ int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffer *bufstatic int iris_destroy_internal_buffers (struct iris_inst *inst,u32 plane,bool force) { -const struct iris_platform_data *platform_data = inst->core->iris_platform_data; +const struct iris_firmware_data *firmware_data = inst->core->iris_firmware_data;struct iris_buffer *buf, *next;struct iris_buffers *buffers;const u32 *internal_buf_type;
@@ -510,19 +510,19 @@ static int iris_destroy_internal_buffers(struct iris_inst *inst, u32 plane, boolif (inst->domain ==DECODER ) {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - len = platform_data->dec_ip_int_buf_tbl_size; + internal_buf_type = firmware_data->dec_ip_int_buf_tbl; + len = firmware_data->dec_ip_int_buf_tbl_size; }else { - internal_buf_type = platform_data->dec_op_int_buf_tbl; - len = platform_data->dec_op_int_buf_tbl_size; + internal_buf_type = firmware_data->dec_op_int_buf_tbl; + len = firmware_data->dec_op_int_buf_tbl_size; } }else {if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - len = platform_data->enc_ip_int_buf_tbl_size; + internal_buf_type = firmware_data->enc_ip_int_buf_tbl; + len = firmware_data->enc_ip_int_buf_tbl_size; }else { - internal_buf_type = platform_data->enc_op_int_buf_tbl; - len = platform_data->enc_op_int_buf_tbl_size; + internal_buf_type = firmware_data->enc_op_int_buf_tbl; + len = firmware_data->enc_op_int_buf_tbl_size; } }
@@ -593,17 +593,17 @@ static int iris_release_internal_buffers(struct iris_inst *inst,static int iris_release_input_internal_buffers (struct iris_inst *inst) { -const struct iris_platform_data *platform_data = inst->core->iris_platform_data; +const struct iris_firmware_data *firmware_data = inst->core->iris_firmware_data;const u32 *internal_buf_type;u32 internal_buffer_count, i;int ret;if (inst->domain ==DECODER ) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - internal_buffer_count = platform_data->dec_ip_int_buf_tbl_size; + internal_buf_type = firmware_data->dec_ip_int_buf_tbl; + internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; }else { - internal_buf_type = platform_data->enc_ip_int_buf_tbl; - internal_buffer_count = platform_data->enc_ip_int_buf_tbl_size; + internal_buf_type = firmware_data->enc_ip_int_buf_tbl; + internal_buffer_count = firmware_data->enc_ip_int_buf_tbl_size; }for (i =0 ; i < internal_buffer_count; i++) {
drivers/media/platform/qcom/iris/iris_core.h +2 -0
@@ -54,6 +54,7 @@ struct qcom_ubwc_cfg_data;* @resets: table of iris reset clocks * @controller_resets: table of controller reset clocks * @iris_platform_data: a structure for platform data +* @iris_firmware_data: a pointer to the firmware (or HFI) specific data * @ubwc_cfg: UBWC configuration for the platform * @state: current state of core * @iface_q_table_daddr: device address for interface queue table memory
@@ -97,6 +98,7 @@ struct iris_core {struct reset_control_bulk_data *resets;struct reset_control_bulk_data *controller_resets;const struct iris_platform_data *iris_platform_data; +const struct iris_firmware_data *iris_firmware_data;const struct qcom_ubwc_cfg_data *ubwc_cfg;enum iris_core_state state;dma_addr_t iface_q_table_daddr;
drivers/media/platform/qcom/iris/iris_ctrls.c +4 -4
@@ -332,8 +332,8 @@ void iris_session_init_caps(struct iris_core *core)const struct platform_inst_fw_cap *caps;u32 i, num_cap, cap_id; - caps = core->iris_platform_data->inst_fw_caps_dec; - num_cap = core->iris_platform_data->inst_fw_caps_dec_size; + caps = core->iris_firmware_data->inst_fw_caps_dec; + num_cap = core->iris_firmware_data->inst_fw_caps_dec_size;for (i =0 ; i < num_cap; i++) { cap_id = caps[i].cap_id;
@@ -360,8 +360,8 @@ void iris_session_init_caps(struct iris_core *core) } } - caps = core->iris_platform_data->inst_fw_caps_enc; - num_cap = core->iris_platform_data->inst_fw_caps_enc_size; + caps = core->iris_firmware_data->inst_fw_caps_enc; + num_cap = core->iris_firmware_data->inst_fw_caps_enc_size;for (i =0 ; i < num_cap; i++) { cap_id = caps[i].cap_id;
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +4 -4
@@ -1033,8 +1033,8 @@ static int iris_hfi_gen1_session_set_config_params(struct iris_inst *inst, u32 p };if (inst->domain ==DECODER ) { - config_params = core->iris_platform_data->dec_input_config_params_default; - config_params_size = core->iris_platform_data->dec_input_config_params_default_size; + config_params = core->iris_firmware_data->dec_input_config_params_default; + config_params_size = core->iris_firmware_data->dec_input_config_params_default_size;if (V4L2_TYPE_IS_OUTPUT (plane)) { handler = vdec_prop_type_handle_inp_arr; handler_size =ARRAY_SIZE (vdec_prop_type_handle_inp_arr);
@@ -1043,8 +1043,8 @@ static int iris_hfi_gen1_session_set_config_params(struct iris_inst *inst, u32 p handler_size =ARRAY_SIZE (vdec_prop_type_handle_out_arr); } }else { - config_params = core->iris_platform_data->enc_input_config_params; - config_params_size = core->iris_platform_data->enc_input_config_params_size; + config_params = core->iris_firmware_data->enc_input_config_params; + config_params_size = core->iris_firmware_data->enc_input_config_params_size; handler = venc_prop_type_handle_inp_arr; handler_size =ARRAY_SIZE (venc_prop_type_handle_inp_arr); }
drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +33 -33
124 lines not on this page · raw message
drivers/media/platform/qcom/iris/iris_platform_common.h +48 -33
108 lines not on this page · raw message
drivers/media/platform/qcom/iris/iris_platform_gen1.c +27 -40
99 lines not on this page · raw message
drivers/media/platform/qcom/iris/iris_platform_gen2.c +39 -209
314 lines not on this page · raw message
drivers/media/platform/qcom/iris/iris_probe.c +2 -1
@@ -251,6 +251,7 @@ static int iris_probe(struct platform_device *pdev)return core->irq; core->iris_platform_data =of_device_get_match_data (core->dev); + core->iris_firmware_data = core->iris_platform_data->firmware_data; core->ubwc_cfg =qcom_ubwc_config_get_data ();if (IS_ERR (core->ubwc_cfg))
@@ -264,7 +265,7 @@ static int iris_probe(struct platform_device *pdev)disable_irq_nosync (core->irq);iris_init_ops (core); - core->iris_platform_data->init_hfi_ops (core); + core->iris_firmware_data->init_hfi_ops (core); ret =iris_init_resources (core);if (ret)
drivers/media/platform/qcom/iris/iris_vidc.c +5 -5
@@ -243,7 +243,7 @@ static void iris_session_close(struct iris_inst *inst)static void iris_check_num_queued_internal_buffers (struct iris_inst *inst,u32 plane) { -const struct iris_platform_data *platform_data = inst->core->iris_platform_data; +const struct iris_firmware_data *firmware_data = inst->core->iris_firmware_data;struct iris_buffer *buf, *next;struct iris_buffers *buffers;const u32 *internal_buf_type;
@@ -251,11 +251,11 @@ static void iris_check_num_queued_internal_buffers(struct iris_inst *inst, u32 pu32 count =0 ;if (V4L2_TYPE_IS_OUTPUT (plane)) { - internal_buf_type = platform_data->dec_ip_int_buf_tbl; - internal_buffer_count = platform_data->dec_ip_int_buf_tbl_size; + internal_buf_type = firmware_data->dec_ip_int_buf_tbl; + internal_buffer_count = firmware_data->dec_ip_int_buf_tbl_size; }else { - internal_buf_type = platform_data->dec_op_int_buf_tbl; - internal_buffer_count = platform_data->dec_op_int_buf_tbl_size; + internal_buf_type = firmware_data->dec_op_int_buf_tbl; + internal_buffer_count = firmware_data->dec_op_int_buf_tbl_size; }for (i =0 ; i < internal_buffer_count; i++) {
drivers/media/platform/qcom/iris/iris_vpu_common.c +1 -1
@@ -63,7 +63,7 @@ static void iris_vpu_setup_ucregion_memory_map(struct iris_core *core)writel (QTBL_ENABLE , core->reg_base +QTBL_INFO );if (core->sfr_daddr) { - value = (u32 )core->sfr_daddr + core->iris_platform_data->core_arch; + value = (u32 )core->sfr_daddr + core->iris_firmware_data->core_arch;writel (value, core->reg_base +SFR_ADDR ); }
Signature · 1 line
2.47.3
Re: [PATCH v8 08/11] media: qcom: iris: split firmware_data from raw platform data
Quoted 11 lines · Dmitry Baryshkov
Having firmware-related fields in platform data results in the tying platform data to the HFI firmware data rather than the actual hardware. For example, SM8450 uses Gen2 firmware, so currently its platform data should be placed next to the other gen2 platforms, although it has the VPU2.0 core, similar to the one found on SM8250 and SC7280 and so the hardware-specific platform data is also close to those devices.
Split firmware data to a separate struct, separating hardware-related data from the firmware interfaces.
Signed-off-by Dmitry Baryshkov <[email protected]>
Thanks,
Dikshita
PATCH v8 9/11 media: qcom: iris: split platform data from firmware data
In reply to Dmitry BaryshkovFinalize the logical separation of the software and hardware interface descriptions by moving hardware properties to the files specific to the particular VPU version.
---
drivers/media/platform/qcom/iris/Makefile | 6 +-
.../iris/{iris_platform_gen1.c => iris_hfi_gen1.c} | 134 -------------
.../iris/{iris_platform_gen2.c => iris_hfi_gen2.c} | 214 ---------------------
.../platform/qcom/iris/iris_platform_common.h | 3 +
.../platform/qcom/iris/iris_platform_sm8250.h | 29 +++
.../platform/qcom/iris/iris_platform_sm8550.h | 31 +++
.../media/platform/qcom/iris/iris_platform_vpu2.c | 124 ++++++++++++
.../media/platform/qcom/iris/iris_platform_vpu3x.c | 204 ++++++++++++++++++++
8 files changed, 395 insertions(+), 350 deletions(-)drivers/media/platform/qcom/iris/Makefile +4 -2
@@ -4,14 +4,16 @@ qcom-iris-objs += iris_buffer.o \ iris_ctrls.o \ iris_firmware.o \ iris_hfi_common.o \ + iris_hfi_gen1.o \ iris_hfi_gen1_command.o \ iris_hfi_gen1_response.o \ + iris_hfi_gen2.o \ iris_hfi_gen2_command.o \ iris_hfi_gen2_packet.o \ iris_hfi_gen2_response.o \ iris_hfi_queue.o \ - iris_platform_gen1.o \ - iris_platform_gen2.o \ + iris_platform_vpu2.o \ + iris_platform_vpu3x.o \ iris_power.o \ iris_probe.o \ iris_resources.o \
drivers/media/platform/qcom/iris/iris_hfi_gen1.c renamed from drivers/media/platform/qcom/iris/iris_platform_gen1.c +0 -134
159 lines not on this page · raw message
drivers/media/platform/qcom/iris/iris_hfi_gen2.c renamed from drivers/media/platform/qcom/iris/iris_platform_gen2.c +0 -214
238 lines not on this page · raw message
drivers/media/platform/qcom/iris/iris_platform_common.h +3 -0
@@ -40,6 +40,9 @@ enum pipe_type { PIPE_4 = 4, }; +extern const struct iris_firmware_data iris_hfi_gen1_data; +extern const struct iris_firmware_data iris_hfi_gen2_data; +extern const struct iris_platform_data qcs8300_data;extern const struct iris_platform_data sc7280_data;extern const struct iris_platform_data sm8250_data;
drivers/media/platform/qcom/iris/iris_platform_sm8250.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. +*/ + +#ifndef __IRIS_PLATFORM_SM8250_H__ +#define __IRIS_PLATFORM_SM8250_H__ + +static const struct bw_info sm8250_bw_table_dec[] = { + { ((4096 *2160 ) /256 ) *60 ,2403000 }, + { ((4096 *2160 ) /256 ) *30 ,1224000 }, + { ((1920 *1080 ) /256 ) *60 ,812000 }, + { ((1920 *1080 ) /256 ) *30 ,416000 }, +}; + +static const char *const sm8250_opp_pd_table[] = {"mx" ,"mmcx" }; + +static const struct platform_clk_data sm8250_clk_table[] = { + {IRIS_AXI_CLK ,"iface" }, + {IRIS_CTRL_CLK ,"core" }, + {IRIS_HW_CLK ,"vcodec0_core" }, +}; + +static const char *const sm8250_opp_clk_table[] = { +"vcodec0_core" , +NULL , +}; + +#endif
drivers/media/platform/qcom/iris/iris_platform_sm8550.h new file +31 -0
@@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) Qualcomm Innovation Center, Inc. All rights reserved. +*/ + +#ifndef __IRIS_PLATFORM_SM8550_H__ +#define __IRIS_PLATFORM_SM8550_H__ + +static const char *const sm8550_clk_reset_table[] = {"bus" }; + +static const struct platform_clk_data sm8550_clk_table[] = { + {IRIS_AXI_CLK ,"iface" }, + {IRIS_CTRL_CLK ,"core" }, + {IRIS_HW_CLK ,"vcodec0_core" }, +}; + +static struct platform_inst_caps platform_inst_cap_sm8550 = { + .min_frame_width =96 , + .max_frame_width =8192 , + .min_frame_height =96 , + .max_frame_height =8192 , + .max_mbpf = (8192 *4352 ) /256 , + .mb_cycles_vpp =200 , + .mb_cycles_fw =489583 , + .mb_cycles_fw_vpp =66234 , + .num_comv =0 , + .max_frame_rate =MAXIMUM_FPS , + .max_operating_rate =MAXIMUM_FPS , +}; + +#endif
drivers/media/platform/qcom/iris/iris_platform_vpu2.c new file +124 -0
124 lines not on this page · raw message
drivers/media/platform/qcom/iris/iris_platform_vpu3x.c new file +204 -0
204 lines not on this page · raw message
Signature · 1 line
2.47.3
Re: [PATCH v8 09/11] media: qcom: iris: split platform data from firmware data
Quoted 5 lines · Dmitry Baryshkov
Finalize the logical separation of the software and hardware interface descriptions by moving hardware properties to the files specific to the particular VPU version.
Signed-off-by Dmitry Baryshkov <[email protected]>
Quoted 10 lines
---
drivers/media/platform/qcom/iris/Makefile | 6 +-
.../iris/{iris_platform_gen1.c => iris_hfi_gen1.c} | 134 -------------
.../iris/{iris_platform_gen2.c => iris_hfi_gen2.c} | 214 ---------------------
.../platform/qcom/iris/iris_platform_common.h | 3 +
.../platform/qcom/iris/iris_platform_sm8250.h | 29 +++
.../platform/qcom/iris/iris_platform_sm8550.h | 31 +++
.../media/platform/qcom/iris/iris_platform_vpu2.c | 124 ++++++++++++
.../media/platform/qcom/iris/iris_platform_vpu3x.c | 204 ++++++++++++++++++++
8 files changed, 395 insertions(+), 350 deletions(-)Thanks,
Dikshita
PATCH v8 10/11 media: qcom: iris: use new firmware name for SM8250
In reply to Dmitry BaryshkovThe linux-firmware is providing the vpuNN_pM.mbn firmware for SM8250 since August of 2024. Stop using the legacy firmware name (vpu-1.0/venus.mbn) and switch to the standard firmware name schema.
--- drivers/media/platform/qcom/iris/iris_platform_vpu2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/iris/iris_platform_vpu2.c +1 -1
@@ -111,7 +111,7 @@ const struct iris_platform_data sm8250_data = { .opp_clk_tbl = sm8250_opp_clk_table,/* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, - .fwname = "qcom/vpu-1.0/venus.mbn", + .fwname = "qcom/vpu/vpu20_p4.mbn", .inst_iris_fmts = iris_fmts_vpu2_dec, .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_vpu2_dec), .inst_caps = &platform_inst_cap_vpu2,
Signature · 1 line
2.47.3
Re: [PATCH v8 10/11] media: qcom: iris: use new firmware name for SM8250
Quoted 6 lines · Dmitry Baryshkov
The linux-firmware is providing the vpuNN_pM.mbn firmware for SM8250 since August of 2024. Stop using the legacy firmware name (vpu-1.0/venus.mbn) and switch to the standard firmware name schema.
Signed-off-by Dmitry Baryshkov<[email protected]>---
Re: [PATCH v8 10/11] media: qcom: iris: use new firmware name for SM8250
In reply to Dmitry BaryshkovQuoted 15 lines · Dmitry Baryshkov
The linux-firmware is providing the vpuNN_pM.mbn firmware for SM8250 since August of 2024. Stop using the legacy firmware name (vpu-1.0/venus.mbn) and switch to the standard firmware name schema.
Signed-off-by Dmitry Baryshkov <[email protected]>--- drivers/media/platform/qcom/iris/iris_platform_vpu2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/media/platform/qcom/iris/iris_platform_vpu2.c +0
-0
drivers/media/platform/qcom/iris/iris_platform_vpu2.c const struct iris_platform_data sm8250_data = { · line 117
Quoted 8 lines
drivers/media/platform/qcom/iris/iris_platform_vpu2.c +1
-1@@ -111,7 +111,7 @@ const struct iris_platform_data sm8250_data = { .opp_clk_tbl = sm8250_opp_clk_table,/* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, - .fwname = "qcom/vpu-1.0/venus.mbn", + .fwname = "qcom/vpu/vpu20_p4.mbn", .inst_iris_fmts = iris_fmts_vpu2_dec, .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_vpu2_dec), .inst_caps = &platform_inst_cap_vpu2,
Thanks,
Dikshita
PATCH v8 11/11 media: qcom: iris: extract firmware description data
In reply to Dmitry BaryshkovIn preparation to adding support for several firmware revisions to be used for a platform, extract the firmware description data. It incorporates firmware name, HFI ops and buffer requirements of the particular firmware build.
--- drivers/media/platform/qcom/iris/iris_buffer.c | 2 +- drivers/media/platform/qcom/iris/iris_core.h | 1 + drivers/media/platform/qcom/iris/iris_firmware.c | 2 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 2 +- .../platform/qcom/iris/iris_platform_common.h | 15 ++++---- .../media/platform/qcom/iris/iris_platform_vpu2.c | 20 +++++++---- .../media/platform/qcom/iris/iris_platform_vpu3x.c | 41 +++++++++++++++------- drivers/media/platform/qcom/iris/iris_probe.c | 3 +- 8 files changed, 57 insertions(+), 29 deletions(-)
drivers/media/platform/qcom/iris/iris_buffer.c +1 -1
@@ -295,7 +295,7 @@ static void iris_fill_internal_buf_info(struct iris_inst *inst, {struct iris_buffers *buffers = &inst->buffers[buffer_type]; - buffers->size = inst->core->iris_platform_data->get_vpu_buffer_size (inst, buffer_type); + buffers->size = inst->core->iris_firmware_desc->get_vpu_buffer_size (inst, buffer_type); buffers->min_count =iris_vpu_buf_count (inst, buffer_type); }
drivers/media/platform/qcom/iris/iris_core.h +1 -0
@@ -99,6 +99,7 @@ struct iris_core {struct reset_control_bulk_data *controller_resets;const struct iris_platform_data *iris_platform_data;const struct iris_firmware_data *iris_firmware_data; +const struct iris_firmware_desc *iris_firmware_desc;const struct qcom_ubwc_cfg_data *ubwc_cfg;enum iris_core_state state;dma_addr_t iface_q_table_daddr;
drivers/media/platform/qcom/iris/iris_firmware.c +1 -1
@@ -72,7 +72,7 @@ int iris_fw_load(struct iris_core *core) ret =of_property_read_string_index (core->dev->of_node,"firmware-name" ,0 , &fwpath);if (ret) - fwpath = core->iris_platform_data->fwname; + fwpath = core->iris_firmware_desc->fwname; ret =iris_load_fw_to_memory (core, fwpath);if (ret) {
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +1 -1
@@ -918,7 +918,7 @@ static int iris_hfi_gen1_set_bufsize(struct iris_inst *inst, u32 plane)if (iris_split_mode_enabled (inst)) { bufsz.type =HFI_BUFFER_OUTPUT ; - bufsz.size = inst->core->iris_platform_data->get_vpu_buffer_size (inst,BUF_DPB ); + bufsz.size = inst->core->iris_firmware_desc->get_vpu_buffer_size (inst,BUF_DPB ); ret =hfi_gen1_set_property (inst, ptype, &bufsz,sizeof (bufsz));if (ret)
drivers/media/platform/qcom/iris/iris_platform_common.h +9 -6
@@ -250,14 +250,18 @@ struct iris_firmware_data {unsigned int enc_op_int_buf_tbl_size; }; +struct iris_firmware_desc { +const struct iris_firmware_data *firmware_data; +u32 (*get_vpu_buffer_size)(struct iris_inst *inst,enum iris_buffer_type buffer_type); +const char *fwname; +}; +struct iris_platform_data {/* -* XXX: remove firmware_data pointer and consider moving -* get_vpu_buffer_size pointer once we have platforms supporting both -* firmware kinds. +* XXX: replace with gen1 / gen2 pointers once we have platforms +* supporting both firmware kinds. */ -const struct iris_firmware_data *firmware_data; -u32 (*get_vpu_buffer_size)(struct iris_inst *inst,enum iris_buffer_type buffer_type); +const struct iris_firmware_desc *firmware_desc;const struct vpu_ops *vpu_ops;const struct icc_info *icc_tbl;
@@ -276,7 +280,6 @@ struct iris_platform_data {const char *const *controller_rst_tbl;unsigned int controller_rst_tbl_size;u64 dma_mask; -const char *fwname;struct iris_fmt *inst_iris_fmts;u32 inst_iris_fmts_size;struct platform_inst_caps *inst_caps;
drivers/media/platform/qcom/iris/iris_platform_vpu2.c +14 -6
@@ -16,6 +16,18 @@#include "iris_platform_sc7280.h" #include "iris_platform_sm8250.h" +const struct iris_firmware_desc iris_vpu20_p1_gen1_desc = { + .firmware_data = &iris_hfi_gen1_data, + .get_vpu_buffer_size = iris_vpu_buf_size, + .fwname ="qcom/vpu/vpu20_p1.mbn" , +}; + +const struct iris_firmware_desc iris_vpu20_p4_gen1_desc = { + .firmware_data = &iris_hfi_gen1_data, + .get_vpu_buffer_size = iris_vpu_buf_size, + .fwname ="qcom/vpu/vpu20_p4.mbn" , +}; +static struct iris_fmt iris_fmts_vpu2_dec[] = { [IRIS_FMT_H264 ] = { .pixfmt =V4L2_PIX_FMT_H264 ,
@@ -62,8 +74,7 @@ static const struct tz_cp_config tz_cp_config_vpu2[] = { };const struct iris_platform_data sc7280_data = { - .firmware_data = &iris_hfi_gen1_data, - .get_vpu_buffer_size = iris_vpu_buf_size, + .firmware_desc = &iris_vpu20_p1_gen1_desc, .vpu_ops = &iris_vpu2_ops, .icc_tbl = iris_icc_info_vpu2, .icc_tbl_size =ARRAY_SIZE (iris_icc_info_vpu2),
@@ -78,7 +89,6 @@ const struct iris_platform_data sc7280_data = { .opp_clk_tbl = sc7280_opp_clk_table,/* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, - .fwname = "qcom/vpu/vpu20_p1.mbn", .inst_iris_fmts = iris_fmts_vpu2_dec, .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_vpu2_dec), .inst_caps = &platform_inst_cap_vpu2,
@@ -93,8 +103,7 @@ const struct iris_platform_data sc7280_data = { };const struct iris_platform_data sm8250_data = { - .firmware_data = &iris_hfi_gen1_data, - .get_vpu_buffer_size = iris_vpu_buf_size, + .firmware_desc = &iris_vpu20_p4_gen1_desc, .vpu_ops = &iris_vpu2_ops, .icc_tbl = iris_icc_info_vpu2, .icc_tbl_size =ARRAY_SIZE (iris_icc_info_vpu2),
@@ -111,7 +120,6 @@ const struct iris_platform_data sm8250_data = { .opp_clk_tbl = sm8250_opp_clk_table,/* Upper bound of DMA address range */ .dma_mask = 0xe0000000 - 1, - .fwname = "qcom/vpu/vpu20_p4.mbn", .inst_iris_fmts = iris_fmts_vpu2_dec, .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_vpu2_dec), .inst_caps = &platform_inst_cap_vpu2,
drivers/media/platform/qcom/iris/iris_platform_vpu3x.c +28 -13
97 lines not on this page · raw message
drivers/media/platform/qcom/iris/iris_probe.c +2 -1
@@ -251,7 +251,8 @@ static int iris_probe(struct platform_device *pdev)return core->irq; core->iris_platform_data =of_device_get_match_data (core->dev); - core->iris_firmware_data = core->iris_platform_data->firmware_data; + core->iris_firmware_desc = core->iris_platform_data->firmware_desc; + core->iris_firmware_data = core->iris_firmware_desc->firmware_data; core->ubwc_cfg =qcom_ubwc_config_get_data ();if (IS_ERR (core->ubwc_cfg))
Signature · 1 line
2.47.3
Dikshita Agarwal
maintainerRe: [PATCH v8 11/11] media: qcom: iris: extract firmware description data
Quoted 35 lines · Dmitry Baryshkov
In preparation to adding support for several firmware revisions to be used for a platform, extract the firmware description data. It incorporates firmware name, HFI ops and buffer requirements of the particular firmware build.
Signed-off-by Dmitry Baryshkov <[email protected]>--- drivers/media/platform/qcom/iris/iris_buffer.c | 2 +- drivers/media/platform/qcom/iris/iris_core.h | 1 + drivers/media/platform/qcom/iris/iris_firmware.c | 2 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 2 +- .../platform/qcom/iris/iris_platform_common.h | 15 ++++---- .../media/platform/qcom/iris/iris_platform_vpu2.c | 20 +++++++---- .../media/platform/qcom/iris/iris_platform_vpu3x.c | 41 +++++++++++++++------- drivers/media/platform/qcom/iris/iris_probe.c | 3 +- 8 files changed, 57 insertions(+), 29 deletions(-)drivers/media/platform/qcom/iris/iris_buffer.c +1
-1@@ -295,7 +295,7 @@ static void iris_fill_internal_buf_info(struct iris_inst *inst, {struct iris_buffers *buffers = &inst->buffers[buffer_type]; - buffers->size = inst->core->iris_platform_data->get_vpu_buffer_size (inst, buffer_type); + buffers->size = inst->core->iris_firmware_desc->get_vpu_buffer_size (inst, buffer_type); buffers->min_count =iris_vpu_buf_count (inst, buffer_type); }drivers/media/platform/qcom/iris/iris_core.h +0
-0
drivers/media/platform/qcom/iris/iris_core.h struct iris_core { · line 102
Quoted 4 lines
drivers/media/platform/qcom/iris/iris_core.h +1
-0@@ -99,6 +99,7 @@ struct iris_core {struct reset_control_bulk_data *controller_resets;const struct iris_platform_data *iris_platform_data;const struct iris_firmware_data *iris_firmware_data; +const struct iris_firmware_desc *iris_firmware_desc;
Missing documentation.
Quoted 3 lines
drivers/media/platform/qcom/iris/iris_core.h +0
-0const struct qcom_ubwc_cfg_data *ubwc_cfg;enum iris_core_state state;dma_addr_t iface_q_table_daddr;
<snip>
drivers/media/platform/qcom/iris/iris_probe.c static int iris_probe(struct platform_device *pdev) · line 254
Quoted 9 lines
index
dd87504c2e67..d36f0c0e785b100644drivers/media/platform/qcom/iris/iris_probe.c +1
-1@@ -251,7 +251,8 @@ static int iris_probe(struct platform_device *pdev)return core->irq; core->iris_platform_data =of_device_get_match_data (core->dev); - core->iris_firmware_data = core->iris_platform_data->firmware_data; + core->iris_firmware_desc = core->iris_platform_data->firmware_desc;
How will iris_firmware_desc be selected once a SoC supports both Gen1 and Gen2 firmware?
Today it’s fixed in platform_data, but eventually probe would need to choose between firmware_desc_gen1 / firmware_desc_gen2 based on the generation.
Thanks,
Dikshita
Quoted 5 lines
drivers/media/platform/qcom/iris/iris_probe.c +1
-0+ core->iris_firmware_data = core->iris_firmware_desc->firmware_data; core->ubwc_cfg =qcom_ubwc_config_get_data ();if (IS_ERR (core->ubwc_cfg))
Re: [PATCH v8 11/11] media: qcom: iris: extract firmware description data
Quoted 33 lines · Dikshita Agarwal
Quoted 30 lines · Dmitry Baryshkov
In preparation to adding support for several firmware revisions to be used for a platform, extract the firmware description data. It incorporates firmware name, HFI ops and buffer requirements of the particular firmware build.
Signed-off-by Dmitry Baryshkov <[email protected]>--- drivers/media/platform/qcom/iris/iris_buffer.c | 2 +- drivers/media/platform/qcom/iris/iris_core.h | 1 + drivers/media/platform/qcom/iris/iris_firmware.c | 2 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 2 +- .../platform/qcom/iris/iris_platform_common.h | 15 ++++---- .../media/platform/qcom/iris/iris_platform_vpu2.c | 20 +++++++---- .../media/platform/qcom/iris/iris_platform_vpu3x.c | 41 +++++++++++++++------- drivers/media/platform/qcom/iris/iris_probe.c | 3 +- 8 files changed, 57 insertions(+), 29 deletions(-)drivers/media/platform/qcom/iris/iris_buffer.c +1
-1@@ -295,7 +295,7 @@ static void iris_fill_internal_buf_info(struct iris_inst *inst, {struct iris_buffers *buffers = &inst->buffers[buffer_type]; - buffers->size = inst->core->iris_platform_data->get_vpu_buffer_size (inst, buffer_type); + buffers->size = inst->core->iris_firmware_desc->get_vpu_buffer_size (inst, buffer_type); buffers->min_count =iris_vpu_buf_count (inst, buffer_type); }
Quoted 11 lines
drivers/media/platform/qcom/iris/iris_core.h struct iris_core { · line 102
Quoted 9 lines
drivers/media/platform/qcom/iris/iris_core.h +1
-0@@ -99,6 +99,7 @@ struct iris_core {struct reset_control_bulk_data *controller_resets;const struct iris_platform_data *iris_platform_data;const struct iris_firmware_data *iris_firmware_data; +const struct iris_firmware_desc *iris_firmware_desc;Missing documentation.
Will fix in v10.
Quoted 13 lines
Quoted 4 lines
drivers/media/platform/qcom/iris/iris_core.h +0
-0const struct qcom_ubwc_cfg_data *ubwc_cfg;enum iris_core_state state;dma_addr_t iface_q_table_daddr;<snip>
Quoted 6 lines
index
dd87504c2e67..d36f0c0e785b100644drivers/media/platform/qcom/iris/iris_probe.c +0
-0@@ -251,7 +251,8 @@ static int iris_probe(struct platform_device *pdev)return core->irq;
Quoted 8 lines
drivers/media/platform/qcom/iris/iris_probe.c static int iris_probe(struct platform_device *pdev) · line 254
Quoted 3 lines
drivers/media/platform/qcom/iris/iris_probe.c +1
-1core->iris_platform_data =of_device_get_match_data (core->dev); - core->iris_firmware_data = core->iris_platform_data->firmware_data; + core->iris_firmware_desc = core->iris_platform_data->firmware_desc;How will
iris_firmware_descbe selected once a SoC supports both Gen1 and Gen2 firmware?
Today it’s fixed inplatform_data, but eventually probe would need to choose betweenfirmware_desc_gen1/firmware_desc_gen2based on the generation.
Yes. Looking at the past firmware releases, we might need to implement more than one "description", e.g. when upgrading between firmware branches would also cause extra side effects (additional codecs, changes to the buffer sizes, etc.). But... I'd really prefer to do that in steps and only when required.
I'd leave concurrent gen1 / gen2 support that to be implemented in your series, if you consider this interface to be worthwhile. Currently every platform supports only one firmware "description".
Signature · 2 lines
With best wishes Dmitry
Dikshita Agarwal
maintainerRe: [PATCH v8 11/11] media: qcom: iris: extract firmware description data
Quoted 76 lines · Dmitry Baryshkov
Quoted 33 lines · Dikshita Agarwal
Quoted 30 lines · Dmitry Baryshkov
In preparation to adding support for several firmware revisions to be used for a platform, extract the firmware description data. It incorporates firmware name, HFI ops and buffer requirements of the particular firmware build.
Signed-off-by Dmitry Baryshkov <[email protected]>--- drivers/media/platform/qcom/iris/iris_buffer.c | 2 +- drivers/media/platform/qcom/iris/iris_core.h | 1 + drivers/media/platform/qcom/iris/iris_firmware.c | 2 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 2 +- .../platform/qcom/iris/iris_platform_common.h | 15 ++++---- .../media/platform/qcom/iris/iris_platform_vpu2.c | 20 +++++++---- .../media/platform/qcom/iris/iris_platform_vpu3x.c | 41 +++++++++++++++------- drivers/media/platform/qcom/iris/iris_probe.c | 3 +- 8 files changed, 57 insertions(+), 29 deletions(-)drivers/media/platform/qcom/iris/iris_buffer.c +1
-1@@ -295,7 +295,7 @@ static void iris_fill_internal_buf_info(struct iris_inst *inst, {struct iris_buffers *buffers = &inst->buffers[buffer_type]; - buffers->size = inst->core->iris_platform_data->get_vpu_buffer_size (inst, buffer_type); + buffers->size = inst->core->iris_firmware_desc->get_vpu_buffer_size (inst, buffer_type); buffers->min_count =iris_vpu_buf_count (inst, buffer_type); }Quoted 11 lines
drivers/media/platform/qcom/iris/iris_core.h struct iris_core { · line 102
Quoted 9 lines
drivers/media/platform/qcom/iris/iris_core.h +1
-0@@ -99,6 +99,7 @@ struct iris_core {struct reset_control_bulk_data *controller_resets;const struct iris_platform_data *iris_platform_data;const struct iris_firmware_data *iris_firmware_data; +const struct iris_firmware_desc *iris_firmware_desc;Missing documentation.
Will fix in v10.
Quoted 13 lines
Quoted 4 lines
drivers/media/platform/qcom/iris/iris_core.h +0
-0const struct qcom_ubwc_cfg_data *ubwc_cfg;enum iris_core_state state;dma_addr_t iface_q_table_daddr;<snip>
Quoted 6 lines
index
dd87504c2e67..d36f0c0e785b100644drivers/media/platform/qcom/iris/iris_probe.c +0
-0@@ -251,7 +251,8 @@ static int iris_probe(struct platform_device *pdev)return core->irq;Quoted 8 lines
drivers/media/platform/qcom/iris/iris_probe.c static int iris_probe(struct platform_device *pdev) · line 254
Quoted 3 lines
drivers/media/platform/qcom/iris/iris_probe.c +1
-1core->iris_platform_data =of_device_get_match_data (core->dev); - core->iris_firmware_data = core->iris_platform_data->firmware_data; + core->iris_firmware_desc = core->iris_platform_data->firmware_desc;How will
iris_firmware_descbe selected once a SoC supports both Gen1 and Gen2 firmware?
Today it’s fixed inplatform_data, but eventually probe would need to choose betweenfirmware_desc_gen1/firmware_desc_gen2based on the generation.Yes. Looking at the past firmware releases, we might need to implement more than one "description", e.g. when upgrading between firmware branches would also cause extra side effects (additional codecs, changes to the buffer sizes, etc.). But... I'd really prefer to do that in steps and only when required.
Quoted 3 lines
I'd leave concurrent gen1 / gen2 support that to be implemented in your series, if you consider this interface to be worthwhile. Currently every platform supports only one firmware "description".
Ack, Thanks.
Regards,
Dikshita
Quoted 1 line
Dikshita Agarwal
maintainerRe: [PATCH v8 11/11] media: qcom: iris: extract firmware description data
In reply to Dikshita AgarwalQuoted 57 lines · Dikshita Agarwal
Quoted 35 lines · Dmitry Baryshkov
In preparation to adding support for several firmware revisions to be used for a platform, extract the firmware description data. It incorporates firmware name, HFI ops and buffer requirements of the particular firmware build.
Signed-off-by Dmitry Baryshkov <[email protected]>--- drivers/media/platform/qcom/iris/iris_buffer.c | 2 +- drivers/media/platform/qcom/iris/iris_core.h | 1 + drivers/media/platform/qcom/iris/iris_firmware.c | 2 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 2 +- .../platform/qcom/iris/iris_platform_common.h | 15 ++++---- .../media/platform/qcom/iris/iris_platform_vpu2.c | 20 +++++++---- .../media/platform/qcom/iris/iris_platform_vpu3x.c | 41 +++++++++++++++------- drivers/media/platform/qcom/iris/iris_probe.c | 3 +- 8 files changed, 57 insertions(+), 29 deletions(-)drivers/media/platform/qcom/iris/iris_buffer.c +1
-1@@ -295,7 +295,7 @@ static void iris_fill_internal_buf_info(struct iris_inst *inst, {struct iris_buffers *buffers = &inst->buffers[buffer_type]; - buffers->size = inst->core->iris_platform_data->get_vpu_buffer_size (inst, buffer_type); + buffers->size = inst->core->iris_firmware_desc->get_vpu_buffer_size (inst, buffer_type); buffers->min_count =iris_vpu_buf_count (inst, buffer_type); }drivers/media/platform/qcom/iris/iris_core.h +0
-0drivers/media/platform/qcom/iris/iris_core.h struct iris_core { · line 102
Quoted 4 lines
drivers/media/platform/qcom/iris/iris_core.h +1
-0@@ -99,6 +99,7 @@ struct iris_core {struct reset_control_bulk_data *controller_resets;const struct iris_platform_data *iris_platform_data;const struct iris_firmware_data *iris_firmware_data; +const struct iris_firmware_desc *iris_firmware_desc;Missing documentation.
Quoted 3 lines
drivers/media/platform/qcom/iris/iris_core.h +0
-0const struct qcom_ubwc_cfg_data *ubwc_cfg;enum iris_core_state state;dma_addr_t iface_q_table_daddr;<snip>
Quoted 6 lines
index
dd87504c2e67..d36f0c0e785b100644drivers/media/platform/qcom/iris/iris_probe.c +0
-0@@ -251,7 +251,8 @@ static int iris_probe(struct platform_device *pdev)return core->irq;
Quoted 8 lines
drivers/media/platform/qcom/iris/iris_probe.c static int iris_probe(struct platform_device *pdev) · line 254
Quoted 3 lines
drivers/media/platform/qcom/iris/iris_probe.c +1
-1core->iris_platform_data =of_device_get_match_data (core->dev); - core->iris_firmware_data = core->iris_platform_data->firmware_data; + core->iris_firmware_desc = core->iris_platform_data->firmware_desc;How will
iris_firmware_descbe selected once a SoC supports both Gen1 and Gen2 firmware?
Today it’s fixed inplatform_data, but eventually probe would need to choose betweenfirmware_desc_gen1/firmware_desc_gen2based on the generation.
something like this would be okay?
if (core->iris_platform_data->firmware_desc_gen2)
core->iris_firmware_desc = core->iris_platform_data->firmware_desc_gen2;
else
core->iris_firmware_desc = core->iris_platform_data->firmware_desc_gen1;
Quoted 8 lines
Thanks,
DikshitaQuoted 5 lines
drivers/media/platform/qcom/iris/iris_probe.c +1
-0+ core->iris_firmware_data = core->iris_firmware_desc->firmware_data; core->ubwc_cfg =qcom_ubwc_config_get_data ();if (IS_ERR (core->ubwc_cfg))
Re: [PATCH v8 11/11] media: qcom: iris: extract firmware description data
Quoted 69 lines · Dikshita Agarwal
Quoted 57 lines · Dikshita Agarwal
Quoted 35 lines · Dmitry Baryshkov
In preparation to adding support for several firmware revisions to be used for a platform, extract the firmware description data. It incorporates firmware name, HFI ops and buffer requirements of the particular firmware build.
Signed-off-by Dmitry Baryshkov <[email protected]>--- drivers/media/platform/qcom/iris/iris_buffer.c | 2 +- drivers/media/platform/qcom/iris/iris_core.h | 1 + drivers/media/platform/qcom/iris/iris_firmware.c | 2 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 2 +- .../platform/qcom/iris/iris_platform_common.h | 15 ++++---- .../media/platform/qcom/iris/iris_platform_vpu2.c | 20 +++++++---- .../media/platform/qcom/iris/iris_platform_vpu3x.c | 41 +++++++++++++++------- drivers/media/platform/qcom/iris/iris_probe.c | 3 +- 8 files changed, 57 insertions(+), 29 deletions(-)drivers/media/platform/qcom/iris/iris_buffer.c +1
-1@@ -295,7 +295,7 @@ static void iris_fill_internal_buf_info(struct iris_inst *inst, {struct iris_buffers *buffers = &inst->buffers[buffer_type]; - buffers->size = inst->core->iris_platform_data->get_vpu_buffer_size (inst, buffer_type); + buffers->size = inst->core->iris_firmware_desc->get_vpu_buffer_size (inst, buffer_type); buffers->min_count =iris_vpu_buf_count (inst, buffer_type); }drivers/media/platform/qcom/iris/iris_core.h +0
-0drivers/media/platform/qcom/iris/iris_core.h struct iris_core { · line 102
Quoted 4 lines
drivers/media/platform/qcom/iris/iris_core.h +1
-0@@ -99,6 +99,7 @@ struct iris_core {struct reset_control_bulk_data *controller_resets;const struct iris_platform_data *iris_platform_data;const struct iris_firmware_data *iris_firmware_data; +const struct iris_firmware_desc *iris_firmware_desc;Missing documentation.
Quoted 3 lines
drivers/media/platform/qcom/iris/iris_core.h +0
-0const struct qcom_ubwc_cfg_data *ubwc_cfg;enum iris_core_state state;dma_addr_t iface_q_table_daddr;<snip>
Quoted 6 lines
index
dd87504c2e67..d36f0c0e785b100644drivers/media/platform/qcom/iris/iris_probe.c +0
-0@@ -251,7 +251,8 @@ static int iris_probe(struct platform_device *pdev)return core->irq;Quoted 8 lines
drivers/media/platform/qcom/iris/iris_probe.c static int iris_probe(struct platform_device *pdev) · line 254
Quoted 3 lines
drivers/media/platform/qcom/iris/iris_probe.c +1
-1core->iris_platform_data =of_device_get_match_data (core->dev); - core->iris_firmware_data = core->iris_platform_data->firmware_data; + core->iris_firmware_desc = core->iris_platform_data->firmware_desc;How will
iris_firmware_descbe selected once a SoC supports both Gen1 and Gen2 firmware?
Today it’s fixed inplatform_data, but eventually probe would need to choose betweenfirmware_desc_gen1/firmware_desc_gen2based on the generation.
Quoted 6 lines
something like this would be okay?
if (
core->iris_platform_data->firmware_desc_gen2)
core->iris_firmware_desc=core->iris_platform_data->firmware_desc_gen2;
else
core->iris_firmware_desc=core->iris_platform_data->firmware_desc_gen1;
Yes :-)
Signature · 2 lines
With best wishes Dmitry