|
| 1 | +diff --color -urpN kernel_oot_modules2/kernel-open/nv_compiler.h kernel_oot_modules/kernel-open/nv_compiler.h |
| 2 | +--- kernel_oot_modules2/kernel-open/nv_compiler.h 1970-01-01 01:00:00.000000000 +0100 |
| 3 | ++++ kernel_oot_modules/kernel-open/nv_compiler.h 2025-02-24 14:59:06.771817940 +0100 |
| 4 | +@@ -0,0 +1 @@ |
| 5 | ++#define NV_COMPILER "collect2: error: ld returned 1 exit status" |
| 6 | +diff --color -urpN kernel_oot_modules2/kernel-open/nvidia/nv-dsi-parse-panel-props.c kernel_oot_modules/kernel-open/nvidia/nv-dsi-parse-panel-props.c |
| 7 | +--- kernel_oot_modules2/kernel-open/nvidia/nv-dsi-parse-panel-props.c 2025-01-08 02:33:51.000000000 +0100 |
| 8 | ++++ kernel_oot_modules/kernel-open/nvidia/nv-dsi-parse-panel-props.c 2025-02-24 14:58:55.871260088 +0100 |
| 9 | +@@ -493,7 +493,7 @@ static int parse_dsi_properties(const st |
| 10 | + "nvidia,dsi-lvds-bridge", &temp)) |
| 11 | + dsi->dsi2lvds_bridge_enable = (bool)temp; |
| 12 | + |
| 13 | +- of_property_for_each_u32(np_dsi_panel, "nvidia,dsi-dpd-pads", prop, p, temp) |
| 14 | ++ of_property_for_each_u32(np_dsi_panel, "nvidia,dsi-dpd-pads", temp) |
| 15 | + dsi->dpd_dsi_pads |= (u32)temp; |
| 16 | + |
| 17 | + if (!of_property_read_u32(np_dsi_panel, |
| 18 | +diff --color -urpN kernel_oot_modules2/kernel-open/nvidia/nv-platform.c kernel_oot_modules/kernel-open/nvidia/nv-platform.c |
| 19 | +--- kernel_oot_modules2/kernel-open/nvidia/nv-platform.c 2025-01-08 02:33:51.000000000 +0100 |
| 20 | ++++ kernel_oot_modules/kernel-open/nvidia/nv-platform.c 2025-02-24 14:56:09.562534365 +0100 |
| 21 | +@@ -1189,7 +1189,11 @@ static int nv_platform_device_probe(stru |
| 22 | + return rc; |
| 23 | + } |
| 24 | + |
| 25 | ++#if KERNEL_VERSION(6, 10, 0) >= LINUX_VERSION_CODE |
| 26 | + static int nv_platform_device_remove(struct platform_device *plat_dev) |
| 27 | ++#else |
| 28 | ++static void nv_platform_device_remove(struct platform_device *plat_dev) |
| 29 | ++#endif |
| 30 | + { |
| 31 | + int rc = 0; |
| 32 | + |
| 33 | +@@ -1203,8 +1207,9 @@ static int nv_platform_device_remove(str |
| 34 | + { |
| 35 | + rc = nv_platform_device_display_remove(plat_dev); |
| 36 | + } |
| 37 | +- |
| 38 | ++ #if KERNEL_VERSION(6, 10, 0) >= LINUX_VERSION_CODE |
| 39 | + return rc; |
| 40 | ++ #endif |
| 41 | + } |
| 42 | + |
| 43 | + const struct of_device_id nv_platform_device_table[] = |
0 commit comments