Merge pull request #321 from jwrdegoede/ipu6-6.13-build-fixes

IPU6 6.13 build fixes
intel · Feb 13, 2025 · 3340c78 · 3340c78
2 parents d976a53 + 0089b52
commit 3340c78
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c
@@ -2681,8 +2681,16 @@ MODULE_AUTHOR("Yunliang Ding <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Intel ipu processing system driver");
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0) || IS_ENABLED(CONFIG_DRM_I915_HAS_SRIOV)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0)
 MODULE_IMPORT_NS(DMA_BUF);
+#else
+MODULE_IMPORT_NS("DMA_BUF");
+#endif
 #endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0)
 MODULE_IMPORT_NS(INTEL_IPU6);
+#else
+MODULE_IMPORT_NS("INTEL_IPU6");
+#endif
 #endif
diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c
@@ -32,7 +32,11 @@
 #include "ipu6-platform-buttress-regs.h"
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0)
 MODULE_IMPORT_NS(DMA_BUF);
+#else
+MODULE_IMPORT_NS("DMA_BUF");
+#endif
 
 static bool early_pg_transfer;
 module_param(early_pg_transfer, bool, 0664);

diff --git a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch
@@ -52,7 +52,7 @@ index 000000000..b26c6aee1
 +
 +struct ipu6_bus_device {
 +	struct auxiliary_device auxdev;
-+	struct auxiliary_driver *auxdrv;
++	const struct auxiliary_driver *auxdrv;
 +	const struct ipu6_auxdrv_data *auxdrv_data;
 +	struct list_head list;
 +	void *pdata;
@@ -92,7 +92,7 @@ new file mode 100644
 index 000000000..9b6f56958
 --- /dev/null
 +++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.h
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,94 @@
 +/* SPDX-License-Identifier: GPL-2.0-only */
 +/* Copyright (C) 2013--2024 Intel Corporation */
 +
@@ -141,7 +141,9 @@ index 000000000..9b6f56958
 +struct ipu6_buttress {
 +	struct mutex power_mutex, auth_mutex, cons_mutex, ipc_mutex;
 +	struct ipu6_buttress_ipc cse;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0)
 +	struct ipu6_buttress_ipc ish;
++#endif
 +	struct list_head constraints;
 +	u32 wdt_cached_value;
 +	bool force_suspend;