up to 390.144

diff --git a/kernel-5.13.patch b/kernel-5.13.patch
deleted file mode 100644 (file)
index c18e5f0..0000000
--- a/kernel-5.13.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- NVIDIA-Linux-x86_64-390.143-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c~       2021-03-12 08:31:39.000000000 +0100
-+++ NVIDIA-Linux-x86_64-390.143-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c        2021-07-02 20:27:35.094061481 +0200
-@@ -39,6 +39,8 @@
- #include <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
- 
-+#include <linux/version.h>
-+
- static const u32 nv_default_supported_plane_drm_formats[] = {
-     DRM_FORMAT_ARGB1555,
-     DRM_FORMAT_XRGB1555,
-@@ -131,12 +133,19 @@
- }
- 
- static int nv_drm_plane_atomic_check(struct drm_plane *plane,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0)
-                                      struct drm_plane_state *plane_state)
-+#else
-+                                     struct drm_atomic_state *state)
-+#endif
- {
-     int i;
-     struct drm_crtc *crtc;
-     struct drm_crtc_state *crtc_state;
-     NvKmsKapiPlaneType type;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0)
-+    struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state, plane);
-+#endif
- 
-     if (NV_DRM_WARN(!drm_plane_type_to_nvkms_plane_type(plane->type, &type))) {
-         goto done;
-@@ -175,12 +175,20 @@
- }
- 
- static void nv_drm_plane_atomic_update(struct drm_plane *plane,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0)
-                                        struct drm_plane_state *old_state)
-+#else
-+                                       struct drm_atomic_state *state)
-+#endif
- {
- }
- 
- static void nv_drm_plane_atomic_disable(struct drm_plane *plane,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0)
-                                         struct drm_plane_state *old_state)
-+#else
-+                                        struct drm_atomic_state *state)
-+#endif
- {
- }
- 

diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index 435eb96e83f8a23f53c2464451721cd02b928bc1..9418111a43fb03f1512ccc769338ba67cc28b6dd 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     4
+%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.143
+Version:       390.144
 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: 7b5704f3c89223d5ecb4f26ca9463c26
+# Source0-md5: 6ee8cd784135bd79f5e416b6815f443d
 Source1:       https://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5: bdfffb4693160a7e2eb7bc2ff43b84bf
+# Source1-md5: 258c635ac21824b282db79745867024d
 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.13.patch
 URL:           https://www.nvidia.com/en-us/drivers/unix/
 BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
@@ -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