From 940d4d216276a5ac9dcffbc6494ac0d1a2245458 Mon Sep 17 00:00:00 2001 From: "Mishra, Saras" Date: Mon, 21 Sep 2026 13:32:13 +0300 Subject: [PATCH] Kernel v7.2.3 Patches --- ...ate-IPU7-firmware-ABI-version-to-1.2.patch | 41 +++++----- ...005-staging-ipu7-Support-IPU8-PCI-ID.patch | 15 ++-- ...ing-ipu7-Add-IPU8-ABI-version-1.0.12.patch | 81 +++++++++---------- ...ine-gpreg_stride-for-different-IPU-v.patch | 34 ++++---- 4 files changed, 82 insertions(+), 89 deletions(-) diff --git a/patch/v7.0.0/0004-staging-ipu7-Update-IPU7-firmware-ABI-version-to-1.2.patch b/patch/v7.0.0/0004-staging-ipu7-Update-IPU7-firmware-ABI-version-to-1.2.patch index be08420..e3bbb49 100644 --- a/patch/v7.0.0/0004-staging-ipu7-Update-IPU7-firmware-ABI-version-to-1.2.patch +++ b/patch/v7.0.0/0004-staging-ipu7-Update-IPU7-firmware-ABI-version-to-1.2.patch @@ -1,10 +1,9 @@ -From 87b28eaee6e463bc40abe782a3fe81b62a57e3c0 Mon Sep 17 00:00:00 2001 -From: linya14x -Date: Fri, 14 Nov 2025 18:41:08 +0800 -Subject: [PATCH 4/7] staging: ipu7: Update IPU7 firmware ABI version to - 1.2.1.20251215_224531 +From 26c7c65e9ebb17fd1458fbc28467051f5eaa6570 Mon Sep 17 00:00:00 2001 +From: "Mishra, Saras" +Date: Mon, 21 Sep 2026 11:19:47 +0300 +Subject: [PATCH] staging: ipu7: Update IPU7 firmware ABI version to 1.2 + (recreated for ToT) -Signed-off-by: Hao Yao --- drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h | 1 + drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h | 11 +++++++---- @@ -12,17 +11,17 @@ Signed-off-by: Hao Yao 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h -index a1519c4fe661..4ce304f54e4b 100644 +index 56b90aab83ea..82e14e59100b 100644 --- a/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h +++ b/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h @@ -153,6 +153,7 @@ enum ia_gofo_boot_state { - IA_GOFO_FW_BOOT_STATE_CRIT_MPU_CONFIG_FAILURE = 0xdead1013U, - IA_GOFO_FW_BOOT_STATE_CRIT_SHARED_BUFFER_FAILURE = 0xdead1014U, - IA_GOFO_FW_BOOT_STATE_CRIT_CMEM_FAILURE = 0xdead1015U, -+ IA_GOFO_FW_BOOT_STATE_CRIT_SYSCOM_CONTEXT_FAILURE = 0xDEAD1016U, - IA_GOFO_FW_BOOT_STATE_SHUTDOWN_CMD = 0x57a7f001U, - IA_GOFO_FW_BOOT_STATE_SHUTDOWN_START = 0x57a7e200U, - IA_GOFO_FW_BOOT_STATE_INACTIVE = 0x57a7e300U, + IA_GOFO_FW_BOOT_STATE_CRIT_MPU_CONFIG_FAILURE = 0xdead1013, + IA_GOFO_FW_BOOT_STATE_CRIT_SHARED_BUFFER_FAILURE = 0xdead1014, + IA_GOFO_FW_BOOT_STATE_CRIT_CMEM_FAILURE = 0xdead1015, ++ IA_GOFO_FW_BOOT_STATE_CRIT_SYSCOM_CONTEXT_FAILURE = 0xdead1016, + IA_GOFO_FW_BOOT_STATE_SHUTDOWN_CMD = 0x57a7f001, + IA_GOFO_FW_BOOT_STATE_SHUTDOWN_START = 0x57a7e200, + IA_GOFO_FW_BOOT_STATE_INACTIVE = 0x57a7e300, diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h index c42d0b7a2627..7f622bfe9af6 100644 --- a/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h @@ -34,7 +33,7 @@ index c42d0b7a2627..7f622bfe9af6 100644 - IPU_INSYS_RESP_TYPE_PWM_IRQ = 11, N_IPU_INSYS_RESP_TYPE }; - + @@ -201,7 +200,8 @@ enum ipu7_insys_mipi_dt_rename_mode { enum ipu7_insys_output_link_dest { IPU_INSYS_OUTPUT_LINK_DEST_MEM = 0, @@ -43,17 +42,17 @@ index c42d0b7a2627..7f622bfe9af6 100644 + IPU_INSYS_OUTPUT_LINK_DEST_IPU_EXTERNAL = 2, + N_IPU_INSYS_OUTPUT_LINK_DEST }; - + enum ipu7_insys_dpcm_type { @@ -220,9 +220,12 @@ enum ipu7_insys_dpcm_predictor { - + enum ipu7_insys_send_queue_token_flag { IPU_INSYS_SEND_QUEUE_TOKEN_FLAG_NONE = 0, - IPU_INSYS_SEND_QUEUE_TOKEN_FLAG_FLUSH_FORCE = 1 + IPU_INSYS_SEND_QUEUE_TOKEN_FLAG_FLUSH_FORCE = 1, + N_IPU_INSYS_SEND_QUEUE_TOKEN_FLAG }; - + +#define IPU_INSYS_MIPI_FRAME_NUMBER_DONT_CARE UINT16_MAX + #pragma pack(push, 1) @@ -66,10 +65,10 @@ index c42d0b7a2627..7f622bfe9af6 100644 - u8 pad[2]; + u16 mipi_fn; }; - + struct ipu7_insys_resp_queue_token { diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h -index 8a78dd0936df..1319f0eb6319 100644 +index 311248385993..9d96ba675cf0 100644 --- a/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h +++ b/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h @@ -217,7 +217,7 @@ struct ipu7_msg_task { @@ -81,6 +80,6 @@ index 8a78dd0936df..1319f0eb6319 100644 ipu7_msg_teb_t payload_reuse_bm; ia_gofo_addr_t term_buffers[IPU_MSG_MAX_NODE_TERMS]; }; --- +-- 2.43.0 diff --git a/patch/v7.0.0/0005-staging-ipu7-Support-IPU8-PCI-ID.patch b/patch/v7.0.0/0005-staging-ipu7-Support-IPU8-PCI-ID.patch index c4c2d05..5422412 100644 --- a/patch/v7.0.0/0005-staging-ipu7-Support-IPU8-PCI-ID.patch +++ b/patch/v7.0.0/0005-staging-ipu7-Support-IPU8-PCI-ID.patch @@ -1,18 +1,17 @@ -From 53ff925f22ce2a546f9cfc71e66434958caaeeda Mon Sep 17 00:00:00 2001 -From: linya14x -Date: Fri, 24 Oct 2025 15:01:40 +0800 -Subject: [PATCH 5/7] staging: ipu7: Support IPU8 PCI ID +From a9293142696d2742c8d69cd58d0f44b5c89a10ee Mon Sep 17 00:00:00 2001 +From: "Mishra, Saras" +Date: Mon, 21 Sep 2026 11:19:48 +0300 +Subject: [PATCH] staging: ipu7: Support IPU8 PCI ID -Signed-off-by: Bingbu Cao --- drivers/staging/media/ipu7/ipu7.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/media/ipu7/ipu7.c b/drivers/staging/media/ipu7/ipu7.c -index a4b0264cc5c7..630a87b83b4b 100644 +index 310e3f24e571..bf20e74ff6e9 100644 --- a/drivers/staging/media/ipu7/ipu7.c +++ b/drivers/staging/media/ipu7/ipu7.c -@@ -2807,6 +2807,7 @@ static const struct dev_pm_ops ipu7_pm_ops = { +@@ -2745,6 +2745,7 @@ static const struct dev_pm_ops ipu7_pm_ops = { static const struct pci_device_id ipu7_pci_tbl[] = { {PCI_DEVICE(PCI_VENDOR_ID_INTEL, IPU7_PCI_ID)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, IPU7P5_PCI_ID)}, @@ -20,6 +19,6 @@ index a4b0264cc5c7..630a87b83b4b 100644 {0,} }; MODULE_DEVICE_TABLE(pci, ipu7_pci_tbl); --- +-- 2.43.0 diff --git a/patch/v7.0.0/0006-staging-ipu7-Add-IPU8-ABI-version-1.0.12.patch b/patch/v7.0.0/0006-staging-ipu7-Add-IPU8-ABI-version-1.0.12.patch index 9ef4115..6421789 100644 --- a/patch/v7.0.0/0006-staging-ipu7-Add-IPU8-ABI-version-1.0.12.patch +++ b/patch/v7.0.0/0006-staging-ipu7-Add-IPU8-ABI-version-1.0.12.patch @@ -1,12 +1,9 @@ -From 998cf5f5f0e4ea225fe0c452f564c242c2f87c14 Mon Sep 17 00:00:00 2001 -From: linya14x -Date: Fri, 24 Oct 2025 12:09:58 +0800 -Subject: [PATCH 6/7] staging: ipu7: Add IPU8 ABI version 1.0.12 +From 0f8b181239a86b9a83b09e85115203e219c8ab31 Mon Sep 17 00:00:00 2001 +From: "Mishra, Saras" +Date: Mon, 21 Sep 2026 11:22:07 +0300 +Subject: [PATCH] staging: ipu7: Add IPU8 ABI version 1.0.12 (recreated for + ToT) -IPU8 firmware ABI should be enabled by --DIPU8_INSYS_NEW_ABI - -Signed-off-by: Hao Yao --- .../staging/media/ipu7/abi/ipu7_fw_boot_abi.h | 15 +++-- .../staging/media/ipu7/abi/ipu7_fw_isys_abi.h | 60 +++++++++++++++++++ @@ -16,34 +13,34 @@ Signed-off-by: Hao Yao 5 files changed, 122 insertions(+), 5 deletions(-) diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h -index 4ce304f54e4b..539192cdd0e7 100644 +index 82e14e59100b..0b2b18ec8ab4 100644 --- a/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h +++ b/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h @@ -113,14 +113,19 @@ struct ia_gofo_secondary_boot_config { - #define IA_GOFO_DOUBLE_EXCEPTION_ERR 0xdead0806U - #define IA_GOFO_BIST_DMEM_FAULT_DETECTION_ERR 0xdead1000U - #define IA_GOFO_BIST_DATA_INTEGRITY_FAILURE 0xdead1010U -+#define IA_GOFO_BOOT_STATE_UNINIT 0x57a7e000U -+#define IA_GOFO_BOOT_STATE_STARTING_0 0x57a7d000U -+#define IA_GOFO_BOOT_STATE_CACHE_INIT_DONE 0x57a7d010U -+#define IA_GOFO_BOOT_STATE_MEM_INIT_DONE 0x57a7d020U -+#define IA_GOFO_BOOT_STATE_STACK_INIT_DONE 0x57a7d030U - + #define IA_GOFO_DOUBLE_EXCEPTION_ERR 0xdead0806 + #define IA_GOFO_BIST_DMEM_FAULT_DETECTION_ERR 0xdead1000 + #define IA_GOFO_BIST_DATA_INTEGRITY_FAILURE 0xdead1010 ++#define IA_GOFO_BOOT_STATE_UNINIT 0x57a7e000 ++#define IA_GOFO_BOOT_STATE_STARTING_0 0x57a7d000 ++#define IA_GOFO_BOOT_STATE_CACHE_INIT_DONE 0x57a7d010 ++#define IA_GOFO_BOOT_STATE_MEM_INIT_DONE 0x57a7d020 ++#define IA_GOFO_BOOT_STATE_STACK_INIT_DONE 0x57a7d030 + enum ia_gofo_boot_state { - IA_GOFO_FW_BOOT_STATE_SECONDARY_BOOT_CONFIG_READY = 0x57a7b000U, -- IA_GOFO_FW_BOOT_STATE_UNINIT = 0x57a7e000U, -- IA_GOFO_FW_BOOT_STATE_STARTING_0 = 0x57a7d000U, -- IA_GOFO_FW_BOOT_STATE_CACHE_INIT_DONE = 0x57a7d010U, -- IA_GOFO_FW_BOOT_STATE_MEM_INIT_DONE = 0x57a7d020U, -- IA_GOFO_FW_BOOT_STATE_STACK_INIT_DONE = 0x57a7d030U, + IA_GOFO_FW_BOOT_STATE_SECONDARY_BOOT_CONFIG_READY = 0x57a7b000, +- IA_GOFO_FW_BOOT_STATE_UNINIT = 0x57a7e000, +- IA_GOFO_FW_BOOT_STATE_STARTING_0 = 0x57a7d000, +- IA_GOFO_FW_BOOT_STATE_CACHE_INIT_DONE = 0x57a7d010, +- IA_GOFO_FW_BOOT_STATE_MEM_INIT_DONE = 0x57a7d020, +- IA_GOFO_FW_BOOT_STATE_STACK_INIT_DONE = 0x57a7d030, + IA_GOFO_FW_BOOT_STATE_UNINIT = IA_GOFO_BOOT_STATE_UNINIT, + IA_GOFO_FW_BOOT_STATE_STARTING_0 = IA_GOFO_BOOT_STATE_STARTING_0, + IA_GOFO_FW_BOOT_STATE_CACHE_INIT_DONE = IA_GOFO_BOOT_STATE_CACHE_INIT_DONE, + IA_GOFO_FW_BOOT_STATE_MEM_INIT_DONE = IA_GOFO_BOOT_STATE_MEM_INIT_DONE, + IA_GOFO_FW_BOOT_STATE_STACK_INIT_DONE = IA_GOFO_BOOT_STATE_STACK_INIT_DONE, - IA_GOFO_FW_BOOT_STATE_EARLY_BOOT_DONE = 0x57a7d100U, - IA_GOFO_FW_BOOT_STATE_BOOT_CONFIG_START = 0x57a7d200U, - IA_GOFO_FW_BOOT_STATE_QUEUE_INIT_DONE = 0x57a7d300U, + IA_GOFO_FW_BOOT_STATE_EARLY_BOOT_DONE = 0x57a7d100, + IA_GOFO_FW_BOOT_STATE_BOOT_CONFIG_START = 0x57a7d200, + IA_GOFO_FW_BOOT_STATE_QUEUE_INIT_DONE = 0x57a7d300, diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h index 7f622bfe9af6..f32674f081d2 100644 --- a/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h @@ -57,12 +54,12 @@ index 7f622bfe9af6..f32674f081d2 100644 + u16 column_right; +#endif }; - + struct ipu7_insys_output_dpcm { @@ -263,16 +267,55 @@ struct ipu7_insys_output_dpcm { u8 pad; }; - + +#ifdef IPU8_INSYS_NEW_ABI +enum ipu_insys_cfa_dim { + IPU_INSYS_CFA_DIM_2x2 = 0, @@ -113,11 +110,11 @@ index 7f622bfe9af6..f32674f081d2 100644 u8 pad[3]; +#endif }; - + struct ipu7_insys_input_pin { @@ -297,7 +340,11 @@ struct ipu7_insys_stream_cfg { }; - + struct ipu7_insys_buffset { +#ifdef IPU8_INSYS_NEW_ABI + struct ipu7_insys_capture_output_pin_cfg output_pins[4]; @@ -144,7 +141,7 @@ index 7f622bfe9af6..f32674f081d2 100644 u16 mipi_fn; +#endif }; - + struct ipu7_insys_resp_queue_token { @@ -372,6 +424,14 @@ enum insys_msg_err_stream { INSYS_MSG_ERR_STREAM_INSUFFICIENT_RESOURCES_OUTPUT = 36, @@ -160,7 +157,7 @@ index 7f622bfe9af6..f32674f081d2 100644 +#endif INSYS_MSG_ERR_STREAM_N }; - + diff --git a/drivers/staging/media/ipu7/ipu7-fw-isys.c b/drivers/staging/media/ipu7/ipu7-fw-isys.c index e4b9c364572b..c98326bd9fee 100644 --- a/drivers/staging/media/ipu7/ipu7-fw-isys.c @@ -175,7 +172,7 @@ index e4b9c364572b..c98326bd9fee 100644 + dev_dbg(dev, "\t.crop.colunm_right = %d\n", + cfg->output_pins[i].crop.column_right); +#endif - + dev_dbg(dev, "\t.dpcm_enable = %d\n", cfg->output_pins[i].dpcm.enable); @@ -275,6 +281,20 @@ void ipu7_fw_isys_dump_stream_cfg(struct device *dev, @@ -200,7 +197,7 @@ index e4b9c364572b..c98326bd9fee 100644 dev_dbg(dev, "---------------------------\n"); } @@ -293,9 +313,18 @@ void ipu7_fw_isys_dump_frame_buff_set(struct device *dev, - + for (i = 0; i < outputs; i++) { dev_dbg(dev, ".output_pin[%d]:\n", i); +#ifndef IPU8_INSYS_NEW_ABI @@ -225,7 +222,7 @@ index 434d9d9c7158..eed46243df43 100644 @@ -248,8 +248,14 @@ static void ipu7_isys_buf_to_fw_frame_buf_pin(struct vb2_buffer *vb, struct ipu7_isys_video_buffer *ivb = vb2_buffer_to_ipu7_isys_video_buffer(vvb); - + +#ifndef IPU8_INSYS_NEW_ABI set->output_pins[aq->fw_output].addr = ivb->dma_addr; set->output_pins[aq->fw_output].user_token = (uintptr_t)set; @@ -235,13 +232,13 @@ index 434d9d9c7158..eed46243df43 100644 + set->output_pins[aq->fw_output].upipe_capture_cfg = 0; +#endif } - + /* diff --git a/drivers/staging/media/ipu7/ipu7-isys-video.c b/drivers/staging/media/ipu7/ipu7-isys-video.c -index 1a7c8a91fffb..09a60170357f 100644 +index 8c6730833f24..7d76d28871d6 100644 --- a/drivers/staging/media/ipu7/ipu7-isys-video.c +++ b/drivers/staging/media/ipu7/ipu7-isys-video.c -@@ -418,10 +418,27 @@ static int ipu7_isys_fw_pin_cfg(struct ipu7_isys_video *av, +@@ -413,10 +413,27 @@ static int ipu7_isys_fw_pin_cfg(struct ipu7_isys_video *av, /* output pin crop */ output_pin->crop.line_top = 0; output_pin->crop.line_bottom = 0; @@ -249,10 +246,10 @@ index 1a7c8a91fffb..09a60170357f 100644 + output_pin->crop.column_left = 0; + output_pin->crop.column_right = 0; +#endif - + /* output de-compression */ output_pin->dpcm.enable = 0; - + +#ifdef IPU8_INSYS_NEW_ABI + /* upipe_cfg */ + output_pin->upipe_pin_cfg.opaque_pin_cfg = 0; @@ -269,6 +266,6 @@ index 1a7c8a91fffb..09a60170357f 100644 /* frame format type */ pfmt = ipu7_isys_get_isys_format(av->pix_fmt.pixelformat); output_pin->ft = (u16)pfmt->css_pixelformat; --- +-- 2.43.0 diff --git a/patch/v7.0.0/0007-staging-ipu7-Define-gpreg_stride-for-different-IPU-v.patch b/patch/v7.0.0/0007-staging-ipu7-Define-gpreg_stride-for-different-IPU-v.patch index 58338ed..c5789b5 100644 --- a/patch/v7.0.0/0007-staging-ipu7-Define-gpreg_stride-for-different-IPU-v.patch +++ b/patch/v7.0.0/0007-staging-ipu7-Define-gpreg_stride-for-different-IPU-v.patch @@ -1,10 +1,8 @@ -From c69967239b91104e8e53b1a1bf930ff8303c4af0 Mon Sep 17 00:00:00 2001 -From: Hao Yao -Date: Mon, 26 Jan 2026 18:10:20 +0800 -Subject: [PATCH 7/7] staging: ipu7: Define gpreg_stride for different IPU - versions +From f023cf969531c2adab8371be7afa736a8b1c8abc Mon Sep 17 00:00:00 2001 +From: "Mishra, Saras" +Date: Mon, 21 Sep 2026 11:22:18 +0300 +Subject: [PATCH] staging: ipu7: Define gpreg_stride for different IPU versions -Signed-off-by: Hao Yao --- drivers/staging/media/ipu7/ipu7-isys-csi-phy.c | 6 ++++-- drivers/staging/media/ipu7/ipu7.c | 3 +++ @@ -12,10 +10,10 @@ Signed-off-by: Hao Yao 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/ipu7/ipu7-isys-csi-phy.c b/drivers/staging/media/ipu7/ipu7-isys-csi-phy.c -index b8c5db7ae300..bd83aef7067e 100644 +index 3f15af3b4c79..0886a78def6e 100644 --- a/drivers/staging/media/ipu7/ipu7-isys-csi-phy.c +++ b/drivers/staging/media/ipu7/ipu7-isys-csi-phy.c -@@ -167,7 +167,8 @@ static void gpreg_write(struct ipu7_isys *isys, u32 id, u32 addr, u32 data) +@@ -168,7 +168,8 @@ static void gpreg_write(struct ipu7_isys *isys, u32 id, u32 addr, u32 data) { void __iomem *isys_base = isys->pdata->base; u32 gpreg = isys->pdata->ipdata->csi2.gpreg; @@ -23,9 +21,9 @@ index b8c5db7ae300..bd83aef7067e 100644 + void __iomem *base = isys_base + gpreg + + isys->pdata->ipdata->csi2.gpreg_stride * id; struct device *dev = &isys->adev->auxdev.dev; - + dev_dbg(dev, "gpreg write: reg 0x%zx = data 0x%08x", -@@ -344,7 +345,8 @@ static int ipu7_isys_phy_ready(struct ipu7_isys *isys, u32 id) +@@ -345,7 +346,8 @@ static int ipu7_isys_phy_ready(struct ipu7_isys *isys, u32 id) { void __iomem *isys_base = isys->pdata->base; u32 gpreg_offset = isys->pdata->ipdata->csi2.gpreg; @@ -36,10 +34,10 @@ index b8c5db7ae300..bd83aef7067e 100644 unsigned int i; u32 phy_ready; diff --git a/drivers/staging/media/ipu7/ipu7.c b/drivers/staging/media/ipu7/ipu7.c -index 630a87b83b4b..db7e452cff04 100644 +index bf20e74ff6e9..0f8ac2b6e436 100644 --- a/drivers/staging/media/ipu7/ipu7.c +++ b/drivers/staging/media/ipu7/ipu7.c -@@ -52,6 +52,7 @@ static const unsigned int ipu7_csi_offsets[] = { +@@ -49,6 +49,7 @@ static const unsigned int ipu7_csi_offsets[] = { static struct ipu_isys_internal_pdata ipu7p5_isys_ipdata = { .csi2 = { .gpreg = IS_IO_CSI2_GPREGS_BASE, @@ -47,7 +45,7 @@ index 630a87b83b4b..db7e452cff04 100644 }, .hw_variant = { .offset = IPU_UNIFIED_OFFSET, -@@ -792,6 +793,7 @@ static struct ipu_psys_internal_pdata ipu7p5_psys_ipdata = { +@@ -789,6 +790,7 @@ static struct ipu_psys_internal_pdata ipu7p5_psys_ipdata = { static struct ipu_isys_internal_pdata ipu7_isys_ipdata = { .csi2 = { .gpreg = IS_IO_CSI2_GPREGS_BASE, @@ -55,7 +53,7 @@ index 630a87b83b4b..db7e452cff04 100644 }, .hw_variant = { .offset = IPU_UNIFIED_OFFSET, -@@ -1309,6 +1311,7 @@ static struct ipu_psys_internal_pdata ipu7_psys_ipdata = { +@@ -1306,6 +1308,7 @@ static struct ipu_psys_internal_pdata ipu7_psys_ipdata = { static struct ipu_isys_internal_pdata ipu8_isys_ipdata = { .csi2 = { .gpreg = IPU8_IS_IO_CSI2_GPREGS_BASE, @@ -64,17 +62,17 @@ index 630a87b83b4b..db7e452cff04 100644 .hw_variant = { .offset = IPU_UNIFIED_OFFSET, diff --git a/drivers/staging/media/ipu7/ipu7.h b/drivers/staging/media/ipu7/ipu7.h -index 3b3ea5fb613f..95ccec4de424 100644 +index ac8ac0689468..29e55e2fbaa2 100644 --- a/drivers/staging/media/ipu7/ipu7.h +++ b/drivers/staging/media/ipu7/ipu7.h -@@ -204,6 +204,7 @@ struct ipu7_isys_internal_csi2_pdata { +@@ -201,6 +201,7 @@ struct ipu7_isys_internal_csi2_pdata { u32 nports; u32 const *offsets; u32 gpreg; + u32 gpreg_stride; }; - + struct ipu7_hw_variants { --- +-- 2.43.0