From e72c1fb298fa9ba6bb9bc2d86a70efc209873ae1 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Sun, 3 Mar 2024 12:20:05 +0100 Subject: [PATCH] nvidia: update to 550.54.14. --- srcpkgs/nvidia/patches/gpl-symbols.patch | 62 ------------------------ srcpkgs/nvidia/template | 26 +++++----- 2 files changed, 13 insertions(+), 75 deletions(-) delete mode 100644 srcpkgs/nvidia/patches/gpl-symbols.patch diff --git a/srcpkgs/nvidia/patches/gpl-symbols.patch b/srcpkgs/nvidia/patches/gpl-symbols.patch deleted file mode 100644 index e0da3fcc2f8708..00000000000000 --- a/srcpkgs/nvidia/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/nvidia/template b/srcpkgs/nvidia/template index e9f5af3a1e4163..6ef49d0a0df659 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -3,8 +3,8 @@ _desc="NVIDIA drivers for linux" pkgname=nvidia -version=535.154.05 -revision=2 +version=550.54.14 +revision=1 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" homepage="https://www.nvidia.com/en-us/drivers/unix/" @@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1 nvidia470>=0 nvidia390>=0" _pkg="NVIDIA-Linux-x86_64-${version}" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" -checksum=7e95065caa6b82de926110f14827a61972eb12c200e863a29e9fb47866eaa898 +checksum=8c497ff1cfc7c310fb875149bc30faa4fd26d2237b2cba6cd2e8b0780157cfe3 # subpackages need to be processed in this specific order subpackages="nvidia-gtklibs nvidia-dkms nvidia-firmware nvidia-opencl nvidia-libs nvidia-libs-32bit" depends="nvidia-libs-${version}_${revision} @@ -101,6 +101,12 @@ _install_libs() { ${DESTDIR}/${libdir}/libnvidia-allocator.so.1 ln -sf libnvidia-allocator.so.1 \ ${DESTDIR}/${libdir}/libnvidia-allocator.so + + vinstall libnvidia-gpucomp.so.${version} 755 ${libdir} + ln -sf libnvidia-gpucomp.so.${version} \ + ${DESTDIR}/${libdir}/libnvidia-gpucomp.so.1 + ln -sf libnvidia-gpucomp.so.1 \ + ${DESTDIR}/${libdir}/libnvidia-gpucomp.so } do_extract() { @@ -130,11 +136,11 @@ do_install() { ${DESTDIR}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1 # Wayland/GBM - vinstall libnvidia-egl-wayland.so.1.1.11 755 usr/lib - ln -sf libnvidia-egl-wayland.so.1.1.11 \ + vinstall libnvidia-egl-wayland.so.1.1.13 755 usr/lib + ln -sf libnvidia-egl-wayland.so.1.1.13 \ ${DESTDIR}/usr/lib/libnvidia-egl-wayland.so.1 - vinstall libnvidia-egl-gbm.so.1.1.0 755 usr/lib - ln -sf libnvidia-egl-gbm.so.1.1.0 \ + vinstall libnvidia-egl-gbm.so.1.1.1 755 usr/lib + ln -sf libnvidia-egl-gbm.so.1.1.1 \ ${DESTDIR}/usr/lib/libnvidia-egl-gbm.so.1 vmkdir usr/share/glvnd/egl_vendor.d @@ -220,12 +226,6 @@ do_install() { # vulkan real-time ray tracing extensions vinstall libnvidia-rtcore.so.${version} 755 usr/lib - vinstall libnvidia-vulkan-producer.so.${version} 755 usr/lib - ln -sf libnvidia-vulkan-producer.so.${version} \ - ${DESTDIR}/usr/lib/libnvidia-vulkan-producer.so - ln -sf libnvidia-vulkan-producer.so.${version} \ - ${DESTDIR}/usr/lib/libnvidia-vulkan-producer.so.1 - # ngx vbin nvidia-ngx-updater vinstall libnvidia-ngx.so.${version} 755 usr/lib