[packages/xorg-driver-video-nvidia] up to 510.47.03

[atler]

commit 086d6cd298b2bc1467024a48deae880fe849eb7f
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Feb 1 15:38:26 2022 +0100

    up to 510.47.03

 kernel-5.16.patch             | 35 -----------------------------------
 xorg-driver-video-nvidia.spec |  6 ++----
 2 files changed, 2 insertions(+), 39 deletions(-)
---
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index d9735cc..0f4770d 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -27,19 +27,18 @@ 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:	495.46
+Version:	510.47.03
 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_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
-# Source0-md5:	db1d6b0f9e590249bbf940a99825f000
+# Source0-md5:	1059d74ba891c412dcc8ae448fecd4ef
 Source2:	%{pname}-xinitrc.sh
 Source3:	gl.pc.in
 Source4:	10-nvidia.conf
 Source5:	10-nvidia-modules.conf
 Patch0:		X11-driver-nvidia-desktop.patch
-Patch1:		kernel-5.16.patch
 URL:		https://www.nvidia.com/en-us/drivers/unix/
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.752
@@ -311,7 +310,6 @@ rm -rf NVIDIA-Linux-x86_64-%{version}
 /bin/sh %{SOURCE0} --extract-only
 %setup -qDT -n NVIDIA-Linux-x86_64-%{version}
 %patch0 -p1
-%patch1 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
diff --git a/kernel-5.16.patch b/kernel-5.16.patch
deleted file mode 100644
index 12cdb49..0000000
--- a/kernel-5.16.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- NVIDIA-Linux-x86_64-495.46/kernel/nvidia-uvm/uvm_migrate_pageable.c~	2021-10-27 19:14:51.000000000 +0200
-+++ NVIDIA-Linux-x86_64-495.46/kernel/nvidia-uvm/uvm_migrate_pageable.c	2022-01-15 14:28:56.947610124 +0100
-@@ -34,6 +34,8 @@
- #include "uvm_migrate_pageable.h"
- #include "uvm_populate_pageable.h"
- 
-+#include <linux/version.h>
-+
- #ifdef UVM_MIGRATE_VMA_SUPPORTED
- 
- static struct kmem_cache *g_uvm_migrate_vma_state_cache __read_mostly;
-@@ -406,7 +408,11 @@
-         uvm_push_set_flag(&push, UVM_PUSH_FLAG_CE_NEXT_MEMBAR_NONE);
-         copying_gpu->parent->ce_hal->memset_8(&push, dst_address, 0, PAGE_SIZE);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0)
-         dst[i] = migrate_pfn(page_to_pfn(dst_page)) | MIGRATE_PFN_LOCKED;
-+#else
-+        dst[i] = migrate_pfn(page_to_pfn(dst_page));
-+#endif
-     }
- 
-     if (copying_gpu) {
-@@ -490,7 +496,11 @@
-         uvm_push_set_flag(&push, UVM_PUSH_FLAG_CE_NEXT_MEMBAR_NONE);
-         copying_gpu->parent->ce_hal->memcopy(&push, dst_address, src_address, PAGE_SIZE);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 16, 0)
-         dst[i] = migrate_pfn(page_to_pfn(dst_page)) | MIGRATE_PFN_LOCKED;
-+#else
-+        dst[i] = migrate_pfn(page_to_pfn(dst_page));
-+#endif
-     }
- 
-     // TODO: Bug 1766424: If the destination is a GPU and the copy was done by
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/086d6cd298b2bc1467024a48deae880fe849eb7f