[intel-ipu6-kmod] Support for 6.5 kernel
commit 6a2d6cea3d14e0fe54044542697083b007cf6135
Author: Kate Hsuan <hpa(a)redhat.com>
Date: Tue Aug 29 14:58:06 2023 +0800
Support for 6.5 kernel
Signed-off-by: Kate Hsuan <hpa(a)redhat.com>
0001-cio2-bridge-Fix-compilation-with-kernel.patch | 90 -----
...u-psys-Fix-compilation-with-kernels-6.5.0.patch | 32 ++
...l_ipu6_isys-Add-video_nr-module-parameter.patch | 54 ---
...-Use-clk-framework-instead-of-a-clke-GPIO.patch | 365 ---------------------
intel-ipu6-kmod.spec | 9 +-
5 files changed, 40 insertions(+), 510 deletions(-)
---
diff --git a/0001-ipu-psys-Fix-compilation-with-kernels-6.5.0.patch
b/0001-ipu-psys-Fix-compilation-with-kernels-6.5.0.patch
new file mode 100644
index 0000000..ccbfcfa
--- /dev/null
+++ b/0001-ipu-psys-Fix-compilation-with-kernels-6.5.0.patch
@@ -0,0 +1,32 @@
+From c93409cfdb39fb13e2f92bae6314a1403496e8e0 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede(a)redhat.com>
+Date: Mon, 28 Aug 2023 15:19:16 +0200
+Subject: [PATCH] ipu-psys: Fix compilation with kernels >= 6.5.0
+
+Kernel 6.5 has removed the last parameter from
+get_user_pages(). Adjust the code accordingly.
+
+Signed-off-by: Hans de Goede <hdegoede(a)redhat.com>
+---
+ drivers/media/pci/intel/ipu-psys.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/media/pci/intel/ipu-psys.c b/drivers/media/pci/intel/ipu-psys.c
+index 2e40849..f1a0ab4 100644
+--- a/drivers/media/pci/intel/ipu-psys.c
++++ b/drivers/media/pci/intel/ipu-psys.c
+@@ -218,7 +218,11 @@ static int ipu_psys_get_userpages(struct ipu_dma_buf_attach
*attach)
+ #else
+ FOLL_WRITE,
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0)
+ pages, NULL);
++#else
++ pages);
++#endif
+ if (nr < npages)
+ goto error_up_read;
+ }
+--
+2.41.0
+
diff --git a/intel-ipu6-kmod.spec b/intel-ipu6-kmod.spec
index 38eaab9..899f3d7 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: 6.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
+Release: 7.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
License: GPLv2+
URL: https://github.com/intel
@@ -25,6 +25,7 @@ Source1:
%{url}/ipu6-drivers/archive/%{ipu6_commit}/ipu6-drivers-%{ipu6_s
# Patches
+Patch10: 0001-ipu-psys-Fix-compilation-with-kernels-6.5.0.patch
BuildRequires: gcc
BuildRequires: elfutils-libelf-devel
@@ -50,6 +51,9 @@ This package contains the kmod module for %{prjname}.
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{prjname}
%{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"}
2>/dev/null
%setup -q -c -a 1
+(cd ipu6-drivers-%{ipu6_commit}
+%patch10 -p1
+)
cp -Rp ivsc-driver-%{ivsc_commit}/backport-include ipu6-drivers-%{ipu6_commit}/
cp -Rp ivsc-driver-%{ivsc_commit}/drivers ipu6-drivers-%{ipu6_commit}/
@@ -94,6 +98,9 @@ done
%changelog
+* Tue Aug 29 2023 Kate Hsuan <hpa(a)redhat.com> - 0.0-7.20230622git8e41080
+- Support for 6.5 kernel
+
* Mon Aug 7 2023 Kate Hsuan <hpa(a)redhat.com> - 0.0-6.20230622git8e41080
- Updated ipu6-driver to commit 8e410803b5d31c2c5bf32961f786d205ba6acc5d
- Updated ivsc-driver to commit cce4377f1539f3e7e8d8b45fbe23e87828ed1deb