[PR PATCH] nvidia470: update to 470.239.06.

[PR PATCH] nvidia470: update to 470.239.06.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

There is a new pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages nvidia_470.239.06
https://github.com/void-linux/void-packages/pull/48904

nvidia470: update to 470.239.06.

#### Testing the changes
- I tested the changes in this PR: **NO**


#### Local build testing
- I built this PR locally for my native architecture, x86_64

A patch file from https://github.com/void-linux/void-packages/pull/48904.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidia_470.239.06-48904.patch --]
[-- Type: text/x-diff, Size: 4074 bytes --]

From b29242ced16d6d9005d896de7de115111b3c49e6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 23 Feb 2024 17:21:28 -0600
Subject: [PATCH] nvidia470: update to 470.239.06.

---
 srcpkgs/nvidia470/patches/gpl-symbols.patch | 62 ---------------------
 srcpkgs/nvidia470/template                  |  6 +-
 2 files changed, 3 insertions(+), 65 deletions(-)
 delete mode 100644 srcpkgs/nvidia470/patches/gpl-symbols.patch

diff --git a/srcpkgs/nvidia470/patches/gpl-symbols.patch b/srcpkgs/nvidia470/patches/gpl-symbols.patch
deleted file mode 100644
index e0da3fcc2f870..0000000000000
--- a/srcpkgs/nvidia470/patches/gpl-symbols.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-linux-6.1.76, 6.6.15, and 6.7.3 have modified the non-ARCH-specific
-pfn_valid() to use __rcu_read_lock/unlock[1] that is marked GPL and
-cannot be used here[2][3][4] unless use the open source variant.
-
-As a workaround, reuse the old implementation until NVIDIA makes
-a fixed release (due to no longer be using pfn_valid[5], likely
-with its own implementation similarly to this patch).
-
-Safe to use with kernel >=5.15 or so but older ones had a different
-pfn_valid implementation. However 5.15 and older branches are
-"currently" not affected, so simply limit to >=6.1.76.
-
-[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/mmzone.h?h=v6.7.3&id=3a01daace71b521563c38bbbf874e14c3e58adb7
-[2] https://bugs.gentoo.org/923456
-[3] https://forums.developer.nvidia.com/t/280908
-[4] https://github.com/NVIDIA/open-gpu-kernel-modules/issues/594
-[5] https://github.com/NVIDIA/open-gpu-kernel-modules/issues/594#issuecomment-1916197641
---- a/kernel/common/inc/nv-linux.h
-+++ b/kernel/common/inc/nv-linux.h
-@@ -1990,2 +1990,23 @@
- 
-+#if defined(CONFIG_HAVE_ARCH_PFN_VALID) || LINUX_VERSION_CODE < KERNEL_VERSION(6,1,76)
-+#  define nv_pfn_valid pfn_valid
-+#else
-+/* pre-6.1.76 kernel pfn_valid version without GPL rcu_read_lock/unlock() */
-+static inline int nv_pfn_valid(unsigned long pfn)
-+{
-+        struct mem_section *ms;
-+
-+        if (PHYS_PFN(PFN_PHYS(pfn)) != pfn)
-+                return 0;
-+
-+        if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS)
-+                return 0;
-+
-+        ms = __pfn_to_section(pfn);
-+        if (!valid_section(ms))
-+                return 0;
-+
-+        return early_section(ms) || pfn_section_valid(ms, pfn);
-+}
-+#endif
- #endif  /* _NV_LINUX_H_ */
---- a/kernel/nvidia/nv-mmap.c
-+++ b/kernel/nvidia/nv-mmap.c
-@@ -576,3 +576,3 @@
-             if (!IS_REG_OFFSET(nv, access_start, access_len) &&
--                (pfn_valid(PFN_DOWN(mmap_start))))
-+                (nv_pfn_valid(PFN_DOWN(mmap_start))))
-             {
---- a/kernel/nvidia/os-mlock.c
-+++ b/kernel/nvidia/os-mlock.c
-@@ -102,3 +102,3 @@
-         if ((nv_follow_pfn(vma, (start + (i * PAGE_SIZE)), &pfn) < 0) ||
--            (!pfn_valid(pfn)))
-+            (!nv_pfn_valid(pfn)))
-         {
-@@ -176,3 +176,3 @@
- 
--    if (pfn_valid(pfn))
-+    if (nv_pfn_valid(pfn))
-     {
diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index 4b4c152809d03..b9fdb1168bbf6 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers (GKxxx “Kepler”)"
 
 pkgname=nvidia470
-version=470.223.02
-revision=2
+version=470.239.06
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1 nvidia390>=0"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=b36862d5336cc3e6ebe8ec3ab4f885b183da258f1dfb1e05ae406b3f6c4d44f8
+checksum=7d74caac140a0432d79ebe8e4330dc796f39ba7dd40b3fcd61df760181bf9ccc
 # subpackages need to be processed in this specific order
 subpackages="nvidia470-gtklibs nvidia470-dkms nvidia470-opencl nvidia470-libs nvidia470-libs-32bit"
 depends="nvidia470-libs-${version}_${revision}

Re: [PR PATCH] [Merged]: nvidia470: update to 470.239.06.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

There's a merged pull request on the void-packages repository

nvidia470: update to 470.239.06.
https://github.com/void-linux/void-packages/pull/48904

Description:

#### Testing the changes
- I tested the changes in this PR: **NO**


#### Local build testing
- I built this PR locally for my native architecture, x86_64