[PATCH v2] media: iris: Support HFI Gen2 on VPU2 4-pipe platforms

[Xilin Wu]

Some VPU2 platforms with four VPP pipes, such as SC8280XP, can use
HFI Gen2 firmware.

Add the Gen2 firmware descriptor to the existing sm8250 platform data.
This lets every platform sharing the VPU2 4-pipe entry select either
firmware generation at runtime.

Signed-off-by: Xilin Wu <sophon@xxxxxxxxx>
---
Changes in v2:
- Extend the sm8250 entry instead of adding a new one. (Dmitry)
- Link to v1: https://patch.msgid.link/20260910-sc8280xp-hfi-gen2-v1-1-ea51d0386fdf@xxxxxxxxx

To: Vikash Garodia <vikash.garodia@xxxxxxxxxxxxxxxx>
To: Dikshita Agarwal <dikshita.agarwal@xxxxxxxxxxxxxxxx>
To: Abhinav Kumar <abhinav.kumar@xxxxxxxxx>
To: Bryan O'Donoghue <bod@xxxxxxxxxx>
To: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Cc: linux-media@xxxxxxxxxxxxxxx
Cc: linux-arm-msm@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
---
 drivers/media/platform/qcom/iris/iris_platform_vpu2.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c b/drivers/media/platform/qcom/iris/iris_platform_vpu2.c
index bbdbf21961d7..0bc559b7a072 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_vpu2.c
@@ -41,6 +41,12 @@ static const struct iris_firmware_desc iris_vpu20_p4_gen1_desc = {
 	.fwname = "qcom/vpu/vpu20_p4.mbn",
 };
 
+static const struct iris_firmware_desc iris_vpu20_p4_gen2_s6_desc = {
+	.firmware_data = &iris_hfi_gen2_data,
+	.get_vpu_buffer_size = iris_vpu33_buf_size,
+	.fwname = "qcom/vpu/vpu20_p4_gen2_s6.mbn",
+};
+
 static const u32 iris_fmts_vpu2_dec[] = {
 	[IRIS_FMT_H264] = V4L2_PIX_FMT_H264,
 	[IRIS_FMT_HEVC] = V4L2_PIX_FMT_HEVC,
@@ -137,6 +143,7 @@ const struct iris_platform_data sc7280_data = {
 
 const struct iris_platform_data sm8250_data = {
 	.firmware_desc_gen1 = &iris_vpu20_p4_gen1_desc,
+	.firmware_desc_gen2 = &iris_vpu20_p4_gen2_s6_desc,
 	.vpu_ops = &iris_vpu2_ops,
 	.icc_tbl = iris_icc_info_vpu2,
 	.icc_tbl_size = ARRAY_SIZE(iris_icc_info_vpu2),

---
base-commit: df2908090cda368b01ff43709f51890076c56157
change-id: 20260910-sc8280xp-hfi-gen2-965c64428089

Best regards,
--  
Xilin Wu <sophon@xxxxxxxxx>