[nvidia-kmod] Fix kernel-6.0rc build issue
commit ad1d19d3d8c04828cbc26abda4f5f5789213d9df
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 26 16:58:11 2022 +0100
Fix kernel-6.0rc build issue
add_missing_include.patch | 23 +++++++++++++++++++++++
nvidia-kmod.spec | 9 ++++++++-
2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/add_missing_include.patch b/add_missing_include.patch
new file mode 100644
index 0000000..49e5665
--- /dev/null
+++ b/add_missing_include.patch
@@ -0,0 +1,23 @@
+From 9a9cfd9eadac06e7c8040be30930f6c9c6e1c3e8 Mon Sep 17 00:00:00 2001
+From: tarsin <43900799+asuka-mio(a)users.noreply.github.com>
+Date: Mon, 15 Aug 2022 13:38:08 +0800
+Subject: [PATCH] Add missing include to fix 6.0-rc1 build
+
+https://github.com/torvalds/linux/commit/720cf96d8fecde29b72e1101f8a567a0ce99594f
+Upstream removed drm_framebuffer.h from drm_crtc.h which cause drm_framebuffer_get
function not found in dkms build
+---
+ kernel/nvidia-drm/nvidia-drm-helper.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-helper.h
b/kernel/nvidia-drm/nvidia-drm-helper.h
+index ecc5ecfdb..455c96a70 100644
+--- a/kernel/nvidia-drm/nvidia-drm-helper.h
++++ b/kernel/nvidia-drm/nvidia-drm-helper.h
+@@ -108,6 +108,7 @@ nv_drm_prime_pages_to_sg(struct drm_device *dev,
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+ #include <drm/drm_crtc.h>
++#include <drm/drm_framebuffer.h>
+
+ #if defined(drm_for_each_plane)
+ #define nv_drm_for_each_plane(plane, dev) \
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 39ab348..7eb69da 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,12 +12,14 @@ Name: nvidia-kmod
Epoch: 3
Version: 515.65.01
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: https://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
+# https://github.com/NVIDIA/open-gpu-kernel-modules/pull/350
+Patch0: add_missing_include.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: x86_64
@@ -46,6 +48,8 @@ mv kernel kernel-closed
mv kernel-open kernel
%endif
# patch loop
+ls
+%patch0 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -80,6 +84,9 @@ done
%changelog
+* Fri Aug 26 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:515.65.01-4
+- Fix kernel-6.0rc build issue
+
* Tue Aug 16 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 3:515.65.01-3
- Restore --with kmod_nvidia_open