- fix building with kernel 6.4, rel 4

diff --git a/kernel-6.4.patch b/kernel-6.4.patch
new file mode 100644 (file)
index 0000000..4a4c63b
--- /dev/null
+++ b/kernel-6.4.patch
@@ -0,0 +1,12 @@
+--- NVIDIA-Linux-x86_64-390.157-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c~        2023-07-30 22:11:45.000000000 +0200
++++ NVIDIA-Linux-x86_64-390.157-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c 2023-07-30 22:22:35.330911515 +0200
+@@ -763,7 +763,9 @@
+ 
+     nv_drm_driver.dumb_create      = nv_drm_dumb_create;
+     nv_drm_driver.dumb_map_offset  = nv_drm_dumb_map_offset;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
+     nv_drm_driver.dumb_destroy     = nv_drm_dumb_destroy;
++#endif
+ 
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_CALLBACKS)
+     nv_drm_driver.gem_vm_ops       = &nv_drm_gem_vma_ops;

diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index 94b9b82c45819e47c77d8c5216cbd7d5acbe832e..916f16eca5a6e4f4202b254a7ecff466deb47ba3 100644 (file)
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -29,7 +29,7 @@ exit 1
 
 %define                no_install_post_check_so 1
 
-%define                rel     3
+%define                rel     4
 %define                pname   xorg-driver-video-nvidia-legacy-390xx
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):     Linux meghajtók nVidia GeForce/Quadro chipekhez
@@ -54,6 +54,7 @@ Patch1:               X11-driver-nvidia-desktop.patch
 Patch2:                kenrel-6.2.patch
 Patch3:                kernel-6.3.patch
 Patch4:                kernel-6.3-uvm.patch
+Patch5:                kernel-6.4.patch
 URL:           https://www.nvidia.com/en-us/drivers/unix/
 BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
@@ -319,6 +320,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %ifarch %{x8664}
 %patch4 -p1
 %endif
+%patch5 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build