Re: [PATCH v7 8/8] media: qcom: iris: split platform data from firmware data

[Vikash Garodia <vikash.garodia@oss.qualcomm.com>]

On 3/17/2026 12:24 AM, Dmitry Baryshkov wrote:
> 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 <dmitry.baryshkov@oss.qualcomm.com>
> ---
>   drivers/media/platform/qcom/iris/Makefile          |   6 +-
>   .../iris/{iris_platform_gen1.c => iris_hfi_gen1.c} | 136 -------------
>   .../iris/{iris_platform_gen2.c => iris_hfi_gen2.c} | 223 ---------------------
>   .../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  | 126 ++++++++++++
>   .../media/platform/qcom/iris/iris_platform_vpu3x.c | 214 ++++++++++++++++++++
>   8 files changed, 407 insertions(+), 361 deletions(-)
> 
> diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile
> index 2fde45f81727..48e415cbc439 100644
> --- a/drivers/media/platform/qcom/iris/Makefile
> +++ b/drivers/media/platform/qcom/iris/Makefile
> @@ -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 \
> diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c
> similarity index 67%
> rename from drivers/media/platform/qcom/iris/iris_platform_gen1.c
> rename to drivers/media/platform/qcom/iris/iris_hfi_gen1.c
> index b2d18459a811..60f51a1ba941 100644
> --- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c
> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c
> @@ -3,38 +3,16 @@
>    * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
>    */
>   
> -#include "iris_core.h"
>   #include "iris_ctrls.h"
>   #include "iris_platform_common.h"
> -#include "iris_resources.h"
>   #include "iris_hfi_gen1.h"
>   #include "iris_hfi_gen1_defines.h"
>   #include "iris_vpu_buffer.h"
> -#include "iris_vpu_common.h"
> -#include "iris_instance.h"
> -
> -#include "iris_platform_sc7280.h"
>   
>   #define BITRATE_MIN		32000
>   #define BITRATE_MAX		160000000
> -#define BITRATE_PEAK_DEFAULT	(BITRATE_DEFAULT * 2)
>   #define BITRATE_STEP		100
>   
> -static struct iris_fmt platform_fmts_sm8250_dec[] = {
> -	[IRIS_FMT_H264] = {
> -		.pixfmt = V4L2_PIX_FMT_H264,
> -		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> -	},
> -	[IRIS_FMT_HEVC] = {
> -		.pixfmt = V4L2_PIX_FMT_HEVC,
> -		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> -	},
> -	[IRIS_FMT_VP9] = {
> -		.pixfmt = V4L2_PIX_FMT_VP9,
> -		.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> -	},
> -};
> -
>   static struct platform_inst_fw_cap inst_fw_cap_sm8250_dec[] = {
>   	{
>   		.cap_id = PIPE,
> @@ -248,56 +226,6 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = {
>   	},
>   };
>   

<snip>

> +
> +const struct iris_platform_data sc7280_data = {
> +	.firmware_data = &iris_hfi_gen1_data,
> +	.get_vpu_buffer_size = iris_vpu_buf_size,
> +	.vpu_ops = &iris_vpu2_ops,
> +	.icc_tbl = iris_icc_info_vpu2,
> +	.icc_tbl_size = ARRAY_SIZE(iris_icc_info_vpu2),
> +	.bw_tbl_dec = sc7280_bw_table_dec,
> +	.bw_tbl_dec_size = ARRAY_SIZE(sc7280_bw_table_dec),
> +	.pmdomain_tbl = iris_pmdomain_table_vpu2,
> +	.pmdomain_tbl_size = ARRAY_SIZE(iris_pmdomain_table_vpu2),
> +	.opp_pd_tbl = sc7280_opp_pd_table,
> +	.opp_pd_tbl_size = ARRAY_SIZE(sc7280_opp_pd_table),
> +	.clk_tbl = sc7280_clk_table,
> +	.clk_tbl_size = ARRAY_SIZE(sc7280_clk_table),
> +	.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,
> +	.tz_cp_config_data = tz_cp_config_vpu2,
> +	.tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu2),
> +	.hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE,

Drop this from platform data as well, its not platform specific and do 
not see it changing in future too.

Regards,
Vikash