[intel-ipu6-kmod] Fix building against 6.11 kernels
commit d63213c15b640bd34f4809c0b17f88663a735745
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Thu Aug 29 12:27:23 2024 +0200
Fix building against 6.11 kernels
0004-fix-6.11-kernel.patch | 29 +++++++++++++++++++++++++++++
intel-ipu6-kmod.spec | 8 +++++++-
2 files changed, 36 insertions(+), 1 deletion(-)
---
diff --git a/0004-fix-6.11-kernel.patch b/0004-fix-6.11-kernel.patch
new file mode 100644
index 0000000..bb94269
--- /dev/null
+++ b/0004-fix-6.11-kernel.patch
@@ -0,0 +1,29 @@
+From 1b753acb70b39920d0ec25fece97a038f2ce038e Mon Sep 17 00:00:00 2001
+From: You-Sheng Yang <vicamo.yang(a)canonical.com>
+Date: Thu, 8 Aug 2024 14:30:51 +0800
+Subject: [PATCH] media: ipu6: Fix compilation with kernels >= 6.11
+
+Signed-off-by: You-Sheng Yang <vicamo.yang(a)canonical.com>
+---
+ drivers/media/pci/intel/ipu-bus.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/media/pci/intel/ipu-bus.c b/drivers/media/pci/intel/ipu-bus.c
+index 0569ccb61969..234fde8f1a42 100644
+--- a/drivers/media/pci/intel/ipu-bus.c
++++ b/drivers/media/pci/intel/ipu-bus.c
+@@ -75,9 +75,13 @@ static const struct dev_pm_ops ipu_bus_pm_ops = {
+ #define IPU_BUS_PM_OPS NULL
+ #endif
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
+ static int ipu_bus_match(struct device *dev, struct device_driver *drv)
++#else
++static int ipu_bus_match(struct device *dev, const struct device_driver *drv)
++#endif
+ {
+- struct ipu_bus_driver *adrv = to_ipu_bus_driver(drv);
++ const struct ipu_bus_driver *adrv = to_ipu_bus_driver(drv);
+
+ dev_dbg(dev, "bus match: \"%s\" --- \"%s\"\n",
dev_name(dev),
+ adrv->wanted);
diff --git a/intel-ipu6-kmod.spec b/intel-ipu6-kmod.spec
index 858062d..1bc44af 100644
--- a/intel-ipu6-kmod.spec
+++ b/intel-ipu6-kmod.spec
@@ -16,7 +16,7 @@
Name: %{prjname}-kmod
Summary: Kernel module (kmod) for %{prjname}
Version: 0.0
-Release: 15.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
+Release: 16.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
License: GPLv2+
URL: https://github.com/intel/ipu6-drivers
@@ -30,6 +30,8 @@ Patch1: 0001-gc5035-Fix-compilation-with-kernels-6.8.patch
Patch2: 0002-media-ipu6-Fix-compilation-with-kernels-6.10.patch
# https://github.com/intel/ipu6-drivers/pull/243
Patch3: 0003-Makefile-prefix-ipu6-modules-with-icamera-instead-of.patch
+# https://github.com/intel/ipu6-drivers/pull/261
+Patch4: 0004-fix-6.11-kernel.patch
# Downstream / Fedora specific patches
Patch101: 0101-Makefile-Adjust-which-modules-to-build-for-which-ker.patch
@@ -59,6 +61,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{prjname}
%{?buil
%patch 1 -p1
%patch 2 -p1
%patch 3 -p1
+%patch 4 -p1
%patch 101 -p1
)
@@ -91,6 +94,9 @@ done
%changelog
+* Thu Aug 29 2024 Hans de Goede <hdegoede(a)redhat.com> - 0.0-16.20240624gitaecec2a
+- Fix building against 6.11 kernels
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
0.0-15.20240624gitaecec2a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild