[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD kernel-5.16.patch)

[Sven-Hendrik Haase]

    Date: Tuesday, February 1, 2022 @ 16:42:32
  Author: svenstaro
Revision: 435680

upgpkg: nvidia-utils 510.47.03-1

Modified:
  nvidia-utils/trunk/PKGBUILD
Deleted:
  nvidia-utils/trunk/kernel-5.16.patch

-------------------+
 PKGBUILD          |   10 +++-------
 kernel-5.16.patch |   27 ---------------------------
 2 files changed, 3 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-01 16:33:17 UTC (rev 435679)
+++ PKGBUILD	2022-02-01 16:42:32 UTC (rev 435680)
@@ -4,8 +4,8 @@
 
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'opencl-nvidia' 'nvidia-dkms')
-pkgver=495.46
-pkgrel=2
+pkgver=510.47.03
+pkgrel=1
 arch=('x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -14,13 +14,11 @@
 source=('nvidia-drm-outputclass.conf'
         'nvidia-utils.sysusers'
         'nvidia.rules'
-        'kernel-5.16.patch'
         "https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run")
 sha512sums=('de7116c09f282a27920a1382df84aa86f559e537664bb30689605177ce37dc5067748acf9afd66a3269a6e323461356592fdfc624c86523bf105ff8fe47d3770'
             '4b3ad73f5076ba90fe0b3a2e712ac9cde76f469cd8070280f960c3ce7dc502d1927f525ae18d008075c8f08ea432f7be0a6c3a7a6b49c361126dcf42f97ec499'
             'a0ceb0a6c240cf97b21a2e46c5c212250d3ee24fecef16aca3dffb04b8350c445b9f4398274abccdb745dd0ba5132a17942c9508ce165d4f97f41ece02b0b989'
-            '72b04ceb2a93d7cc5e69b8f52d6398a7cfa0184b08c339a190be9b4fa35b28392be8334872aeed94acab23a319ff36896179a5ad6911fbd053e8fa7dcfa0a431'
-            '859548fa81478acb994b40434fc85824976b1f83bc15846290898854db84ea3c6550586a1d7e89ff3afa248310d2bcf4d2d52d5d8e91cf74e3f7e4108a7002ad')
+            '7488b1ae99acfa4cd6f8fd071a0e7652dcc9e499ff587d1dfdaf5d202a5b9daa43ed014876d2b2c9caf7f7c531ec380540f30833bb9790395cf159d177f2e803')
 
 
 create_links() {
@@ -40,8 +38,6 @@
 
     cd kernel
 
-    patch -Np1 -i "$srcdir/kernel-5.16.patch"
-
     sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
     sed -i 's/__JOBS/`nproc`/' dkms.conf
     sed -i 's/__DKMS_MODULES//' dkms.conf

Deleted: kernel-5.16.patch
===================================================================
--- kernel-5.16.patch	2022-02-01 16:33:17 UTC (rev 435679)
+++ kernel-5.16.patch	2022-02-01 16:42:32 UTC (rev 435680)
@@ -1,27 +0,0 @@
-diff -u -r kernel/nvidia-uvm/uvm_migrate_pageable.c kernel-5.16/nvidia-uvm/uvm_migrate_pageable.c
---- kernel/nvidia-uvm/uvm_migrate_pageable.c	2021-10-27 17:14:51.000000000 +0000
-+++ kernel-5.16/nvidia-uvm/uvm_migrate_pageable.c	2022-01-10 21:03:33.937906621 +0000
-@@ -406,7 +406,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 +494,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