470.42.01

4 files changed, 37 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 327188bde678..49a667687a18 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = nvidia-dkms-performance
-	pkgver = 465.31
-	pkgrel = 2
+	pkgver = 470.42.01
+	pkgrel = 1
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom
-	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/465.31/NVIDIA-Linux-x86_64-465.31.run
+	options = !strip
+	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/470.42.01/NVIDIA-Linux-x86_64-470.42.01.run
 	source = nvidia-drm-outputclass.conf
 	source = nvidia-utils.sysusers
 	source = nvidia.hook
@@ -13,12 +14,12 @@ pkgbase = nvidia-dkms-performance
 	source = 0003-nvidia-drm-modeset.patch
 	source = 0004-NVreg-Improvements.patch
 	source = 0005-nvidia-settings-paths.patch
-	sha256sums = 6008d001c9335863049c338e7ba6ab96406f4f7af31427aa8c18c6d277272cda
+	sha256sums = cdf554eafd5ccea00cd0e961e26337b7e8337ac8a2ad57ef019cfb3d62b58913
 	sha256sums = ae1fee1238da7aeb0e2d3e3d3fe4478dfe3a2bcbbab529586ac8f3bb55aa47ae
 	sha256sums = d8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167
 	sha256sums = 717920f48b4d7ec50b83d2d096bab36449b30f1b5d144f0fe586627025367293
-	sha256sums = b6f9a1350c3734297c314e7211e24aab0071de9ff3b0cc536bed59f5461e4822
-	sha256sums = f631b7e545ed5d121918a773ec51e12e2e95cb340757ebb3689a295ae066c4e3
+	sha256sums = 1bc089100f8eb43634f065008b8b6e4a13070f5341d2929cecff51a40a8adeba
+	sha256sums = ed20d9fa8b04d8f519feef42f4ffea7998bc29457b4e48d0b2ca863330125fce
 	sha256sums = 7d9392f36374ab609417abe4b5493bbb9d868a2ee29cdb877d4be8b098eb527b
 	sha256sums = 898fe80847fb2974e1d16b380c16569ddb3ab24c6974bbeb72d68e8e13902311
 	sha256sums = 6bb5456f14435ad329d750147c749d7c50fb8ae11778c7fcc9e6e3cd256c4017
@@ -26,21 +27,21 @@ pkgbase = nvidia-dkms-performance
 pkgname = nvidia-dkms-performance
 	pkgdesc = NVIDIA driver sources for linux with some optimizations
 	depends = dkms
-	depends = nvidia-utils-performance=465.31
+	depends = nvidia-utils-performance=470.42.01
 	depends = libglvnd
-	provides = nvidia=465.31
-	provides = nvidia-dkms=465.31
-	provides = nvidia-dkms-performance=465.31
+	provides = nvidia=470.42.01
+	provides = nvidia-dkms=470.42.01
+	provides = nvidia-dkms-performance=470.42.01
 	provides = NVIDIA-MODULE
 	conflicts = nvidia
 	conflicts = nvidia-dkms
 
 pkgname = nvidia-settings-performance
 	pkgdesc = Tool for configuring the NVIDIA graphics driver
-	depends = nvidia-utils-performance>=465.31
+	depends = nvidia-utils-performance>=470.42.01
 	depends = gtk3
-	provides = nvidia-settings=465.31
-	provides = nvidia-settings-performance=465.31
+	provides = nvidia-settings=470.42.01
+	provides = nvidia-settings-performance=470.42.01
 	conflicts = nvidia-settings
 
 pkgname = nvidia-utils-performance
@@ -52,11 +53,11 @@ pkgname = nvidia-utils-performance
 	optdepends = xorg-server-devel: for nvidia-xconfig
 	optdepends = egl-wayland: for Wayland support
 	optdepends = opencl-nvidia-performance: for OpenCL support
-	provides = nvidia-utils=465.31
+	provides = nvidia-utils=470.42.01
 	provides = vulkan-driver
 	provides = opengl-driver
-	provides = nvidia-libgl=465.31
-	provides = nvidia-libgl-performance=465.31
+	provides = nvidia-libgl=470.42.01
+	provides = nvidia-libgl-performance=470.42.01
 	conflicts = nvidia-utils
 	conflicts = nvidia-libgl
 	replaces = nvidia-libgl
@@ -64,9 +65,9 @@ pkgname = nvidia-utils-performance
 pkgname = opencl-nvidia-performance
 	pkgdesc = OpenCL implemention for NVIDIA
 	depends = zlib
-	depends = nvidia-utils-performance>=465.31
+	depends = nvidia-utils-performance>=470.42.01
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = opencl-nvidia=465.31
+	provides = opencl-nvidia=470.42.01
 	provides = opencl-driver
 	conflicts = opencl-nvidia
 
@@ -75,13 +76,13 @@ pkgname = lib32-nvidia-utils-performance
 	depends = lib32-zlib
 	depends = lib32-gcc-libs
 	depends = lib32-libglvnd
-	depends = nvidia-utils-performance>=465.31
+	depends = nvidia-utils-performance>=470.42.01
 	optdepends = lib32-opencl-nvidia-performance: for OpenCL support
-	provides = lib32-nvidia-utils=465.31
+	provides = lib32-nvidia-utils=470.42.01
 	provides = lib32-vulkan-driver
 	provides = lib32-opengl-driver
-	provides = lib32-nvidia-libgl=465.31
-	provides = lib32-nvidia-libgl-performance=465.31
+	provides = lib32-nvidia-libgl=470.42.01
+	provides = lib32-nvidia-libgl-performance=470.42.01
 	conflicts = lib32-nvidia-utils
 	conflicts = lib32-nvidia-libgl
 	replaces = lib32-nvidia-libgl
@@ -90,9 +91,8 @@ pkgname = lib32-opencl-nvidia-performance
 	pkgdesc = OpenCL implemention for NVIDIA (Multilib)
 	depends = lib32-zlib
 	depends = lib32-gcc-libs
-	depends = lib32-nvidia-utils-performance>=465.31
+	depends = lib32-nvidia-utils-performance>=470.42.01
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = lib32-opencl-nvidia=465.31
+	provides = lib32-opencl-nvidia=470.42.01
 	provides = lib32-opencl-driver
 	conflicts = lib32-opencl-nvidia
-
diff --git a/0001-nvidia-dkms-conf.patch b/0001-nvidia-dkms-conf.patch
index 1552249c6c9f..f3b8b3861922 100644
--- a/0001-nvidia-dkms-conf.patch
+++ b/0001-nvidia-dkms-conf.patch
@@ -14,7 +14,7 @@ index 4e23d59..4381d45 100644
 @@ -1,12 +1,20 @@
  PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_VERSION="465.31"
++PACKAGE_VERSION="470.42.01"
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/0002-linux-rt.patch b/0002-linux-rt.patch
index 73f749f0ac00..f5a6a7a8de47 100644
--- a/0002-linux-rt.patch
+++ b/0002-linux-rt.patch
@@ -13,7 +13,7 @@ diff --git a/kernel/conftest.sh b/kernel/conftest.sh
 index 0be67cf..a0559c2 100755
 --- a/kernel/conftest.sh
 +++ b/kernel/conftest.sh
-@@ -4693,9 +4693,9 @@ case "$5" in
+@@ -4792,9 +4792,9 @@ case "$5" in
          fi
  
          if test_configuration_option CONFIG_PREEMPT_RT; then
diff --git a/PKGBUILD b/PKGBUILD
index 20bb5c65ede8..903a4e25cbae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -68,11 +68,12 @@ _override_max_perf=
 
 pkgbase=nvidia-dkms-performance
 pkgname=(nvidia-dkms-performance nvidia-settings-performance nvidia-utils-performance opencl-nvidia-performance lib32-nvidia-utils-performance lib32-opencl-nvidia-performance)
-pkgver=465.31
-pkgrel=2
+pkgver=470.42.01
+pkgrel=1
 arch=('x86_64')
 url='https://www.nvidia.com/'
 license=('custom')
+options=(!strip)
 _pkg="NVIDIA-Linux-${CARCH}-${pkgver}"
 source=("https://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_pkg}.run"
         'nvidia-drm-outputclass.conf'
@@ -234,16 +235,15 @@ package_nvidia-utils-performance() {
     replaces=('nvidia-libgl')
     install=nvidia-utils-performance.install
     cd "${_pkg}"
-    
+
     # X driver
-    # TODO: Can be fixed with an ugly binary patch to fix broken GPU overclocking on NVIDIA Optimus laptops.
-    # See: 
-    # https://forums.developer.nvidia.com/t/option-coolbits-is-not-used-optimus-enabled-laptop-running-an-rtx-2070-manjaro-linux/111771/2
     install -D -m755 nvidia_drv.so -t "${pkgdir}/usr/lib/xorg/modules/drivers"
     
+    # firmware
+    install -D -m644 firmware/gsp.bin -t "${pkgdir}/usr/lib/firmware/nvidia/${pkgver}"
+    
     # GLX extension module for X
     install -D -m755 "libglxserver_nvidia.so.${pkgver}" -t "${pkgdir}/usr/lib/nvidia/xorg"
-
     # Ensure that X finds glx
     ln -s "libglxserver_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1"
     ln -s "libglxserver_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglxserver_nvidia.so"
@@ -328,7 +328,6 @@ package_nvidia-utils-performance() {
     sed -i 's/__USER__/nvidia-persistenced/' "${pkgdir}/usr/lib/systemd/system/nvidia-persistenced.service"
     
     # application profiles
-    # TODO: It is possible to add custom application profiles to improve their performance. 
     install -D -m644 "nvidia-application-profiles-${pkgver}-rc" -t "${pkgdir}/usr/share/nvidia"
     install -D -m644 "nvidia-application-profiles-${pkgver}-key-documentation" -t "${pkgdir}/usr/share/nvidia"
     
@@ -422,12 +421,12 @@ package_lib32-nvidia-utils-performance() {
     install -D -m644 "${srcdir}/${_pkg}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
-sha256sums=('6008d001c9335863049c338e7ba6ab96406f4f7af31427aa8c18c6d277272cda'
+sha256sums=('cdf554eafd5ccea00cd0e961e26337b7e8337ac8a2ad57ef019cfb3d62b58913'
             'ae1fee1238da7aeb0e2d3e3d3fe4478dfe3a2bcbbab529586ac8f3bb55aa47ae'
             'd8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167'
             '717920f48b4d7ec50b83d2d096bab36449b30f1b5d144f0fe586627025367293'
-            'b6f9a1350c3734297c314e7211e24aab0071de9ff3b0cc536bed59f5461e4822'
-            'f631b7e545ed5d121918a773ec51e12e2e95cb340757ebb3689a295ae066c4e3'
+            '1bc089100f8eb43634f065008b8b6e4a13070f5341d2929cecff51a40a8adeba'
+            'ed20d9fa8b04d8f519feef42f4ffea7998bc29457b4e48d0b2ca863330125fce'
             '7d9392f36374ab609417abe4b5493bbb9d868a2ee29cdb877d4be8b098eb527b'
             '898fe80847fb2974e1d16b380c16569ddb3ab24c6974bbeb72d68e8e13902311'
             '6bb5456f14435ad329d750147c749d7c50fb8ae11778c7fcc9e6e3cd256c4017')