- up to 390.147

diff --git a/kernel-5.14.patch b/kernel-5.14.patch
deleted file mode 100644 (file)
index c2683b3..0000000
--- a/kernel-5.14.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/os-interface.c~      2021-06-03 01:09:57.000000000 +0200
-+++ NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/os-interface.c       2021-09-07 21:53:39.925501620 +0200
-@@ -580,7 +580,11 @@
-         // the requested timeout has expired, loop until less
-         // than a jiffie of the desired delay remains.
-         //
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 14, 0))
-+        set_current_state(TASK_INTERRUPTIBLE);
-+#else
-         current->state = TASK_INTERRUPTIBLE;
-+#endif
-         do
-         {
-             schedule_timeout(jiffies);
---- NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/nvlink_linux.c~      2021-06-03 01:10:01.000000000 +0200
-+++ NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia/nvlink_linux.c       2021-09-07 21:56:33.935565412 +0200
-@@ -597,7 +597,11 @@
-         // the requested timeout has expired, loop until less
-         // than a jiffie of the desired delay remains.
-         //
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 14, 0))
-+        set_current_state(TASK_INTERRUPTIBLE);
-+#else
-         current->state = TASK_INTERRUPTIBLE;
-+#endif
-         do
-         {
-             schedule_timeout(jiffies);
---- NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c~        2021-06-03 01:10:01.000000000 +0200
-+++ NVIDIA-Linux-x86_64-390.144-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c 2021-09-07 22:06:07.148309829 +0200
-@@ -20,6 +20,7 @@
-  * DEALINGS IN THE SOFTWARE.
-  */
- 
-+#include "linux/version.h"
- #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */
- 
- #include "nvidia-drm-priv.h"
-@@ -811,7 +811,9 @@
- 
-     dev->dev_private = nv_dev;
-     nv_dev->dev = dev;
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0))
-     dev->pdev = pdev;
-+#endif
- 
-     /* Register DRM device to DRM sub-system */
- 

diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index c9aaa87429119b4ca1c718849d1bcc5b9fa2f4d3..22dd3a780c419789dfc2f02bd660c046fdfe036b 100644 (file)
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -29,29 +29,28 @@ exit 1
 
 %define                no_install_post_check_so 1
 
-%define                rel     3
+%define                rel     1
 %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
 Summary(pl.UTF-8):     Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 # when updating version here, keep nvidia-settings.spec in sync as well
-Version:       390.144
+Version:       390.147
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 Epoch:         1
 License:       nVidia Binary
 Group:         X11
 Source0:       https://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
-# Source0-md5: 6ee8cd784135bd79f5e416b6815f443d
+# Source0-md5: 7af8932a2ae9326cfe8638fe77d62441
 Source1:       https://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5: 258c635ac21824b282db79745867024d
+# Source1-md5: 7f2c2c04c6039b177d50b23a1ae223d6
 Source2:       %{pname}-xinitrc.sh
 Source3:       gl.pc.in
 Source4:       10-nvidia.conf
 Source5:       10-nvidia-modules.conf
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
-Patch2:                kernel-5.14.patch
 URL:           https://www.nvidia.com/en-us/drivers/unix/
 BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
@@ -60,7 +59,7 @@ BuildRequires:        sed >= 4.0
 BuildConflicts:        XFree86-nvidia
 Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:      xorg-xserver-server
-Requires:      xorg-xserver-server(videodrv-abi) <= 24.1
+Requires:      xorg-xserver-server(videodrv-abi) <= 25.2
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:      ocl-icd(nvidia)
 Provides:      ocl-icd-driver
@@ -312,7 +311,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build