Update to version 550.40.07

3 files changed, 21 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6e6f230c61e..36dbfcecee1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = nvidia-utils-beta
 	pkgdesc = NVIDIA drivers utilities (beta version)
-	pkgver = 545.29.06
+	pkgver = 550.40.07
 	pkgrel = 1
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom
 	options = !strip
-	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/545.29.06/NVIDIA-Linux-x86_64-545.29.06.run
+	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/550.40.07/NVIDIA-Linux-x86_64-550.40.07.run
 	source = nvidia-drm-outputclass.conf
 	source = nvidia-utils.sysusers
 	source = nvidia.rules
 	source = 120-nvidia-settings-change-desktop-paths.patch
-	sha256sums = 82bc55676add43416c146e70c624c8dc6af16cc04c7238680c56a30e0045b17b
+	sha256sums = 298936c727b7eefed95bb87eb8d24cfeef1f35fecac864d98e2694d37749a4ad
 	sha256sums = be99ff3def641bb900c2486cce96530394c5dc60548fc4642f19d3a4c784134d
 	sha256sums = d8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167
-	sha256sums = 4fbfd461f939f18786e79f8dba5fdb48be9f00f2ff4b1bb2f184dbce42dd6fc3
+	sha256sums = 2b6a1512e3c35a2f10655b0cbc06451129804e7741a9868e986cb75c5575ade9
 	sha256sums = 6f0f4a23706241e9e37e0fe30a09bd30ca29bb446d8fe7861cb4959f0a010ef4
 
 pkgname = nvidia-utils-beta
@@ -25,11 +25,11 @@ pkgname = nvidia-utils-beta
 	optdepends = nvidia-settings-beta: for the configuration tool
 	optdepends = xorg-server-devel: for nvidia-xconfig
 	optdepends = opencl-nvidia-beta: for OpenCL support
-	provides = nvidia-utils=545.29.06
+	provides = nvidia-utils=550.40.07
 	provides = vulkan-driver
 	provides = opengl-driver
-	provides = nvidia-libgl=545.29.06
-	provides = nvidia-libgl-beta=545.29.06
+	provides = nvidia-libgl=550.40.07
+	provides = nvidia-libgl-beta=550.40.07
 	conflicts = nvidia-utils
 	conflicts = nvidia-libgl
 	replaces = nvidia-libgl
@@ -37,16 +37,16 @@ pkgname = nvidia-utils-beta
 pkgname = opencl-nvidia-beta
 	pkgdesc = OpenCL implemention for NVIDIA (beta version)
 	depends = zlib
-	depends = nvidia-utils-beta>=545.29.06
+	depends = nvidia-utils-beta>=550.40.07
 	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = opencl-nvidia=545.29.06
+	provides = opencl-nvidia=550.40.07
 	provides = opencl-driver
 	conflicts = opencl-nvidia
 
 pkgname = nvidia-settings-beta
 	pkgdesc = Tool for configuring the NVIDIA graphics driver (beta version)
-	depends = nvidia-utils-beta>=545.29.06
+	depends = nvidia-utils-beta>=550.40.07
 	depends = gtk3
-	provides = nvidia-settings=545.29.06
-	provides = nvidia-settings-beta=545.29.06
+	provides = nvidia-settings=550.40.07
+	provides = nvidia-settings-beta=550.40.07
 	conflicts = nvidia-settings
diff --git a/PKGBUILD b/PKGBUILD
index fc0d750089f3..e4cbfa507235 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=nvidia-utils-beta
 pkgname=('nvidia-utils-beta' 'opencl-nvidia-beta' 'nvidia-settings-beta')
-pkgver=545.29.06
+pkgver=550.40.07
 pkgrel=1
 pkgdesc='NVIDIA drivers utilities (beta version)'
 arch=('x86_64')
@@ -18,10 +18,10 @@ source=("https://us.download.nvidia.com/XFree86/Linux-${CARCH}/${pkgver}/${_pkg}
         'nvidia-utils.sysusers'
         'nvidia.rules'
         '120-nvidia-settings-change-desktop-paths.patch')
-sha256sums=('82bc55676add43416c146e70c624c8dc6af16cc04c7238680c56a30e0045b17b'
+sha256sums=('298936c727b7eefed95bb87eb8d24cfeef1f35fecac864d98e2694d37749a4ad'
             'be99ff3def641bb900c2486cce96530394c5dc60548fc4642f19d3a4c784134d'
             'd8d1caa5d72c71c6430c2a0d9ce1a674787e9272ccce28b9d5898ca24e60a167'
-            '4fbfd461f939f18786e79f8dba5fdb48be9f00f2ff4b1bb2f184dbce42dd6fc3'
+            '2b6a1512e3c35a2f10655b0cbc06451129804e7741a9868e986cb75c5575ade9'
             '6f0f4a23706241e9e37e0fe30a09bd30ca29bb446d8fe7861cb4959f0a010ef4')
 
 # create soname links
@@ -171,7 +171,7 @@ package_nvidia-utils-beta() {
     
     # Wayland/GBM
     install -D -m755 "libnvidia-allocator.so.${pkgver}" -t "${pkgdir}/usr/lib"
-    install -D -m755 libnvidia-egl-gbm.so.1.1.0         -t "${pkgdir}/usr/lib"
+    install -D -m755 libnvidia-egl-gbm.so.1.1.1         -t "${pkgdir}/usr/lib"
     install -D -m644 15_nvidia_gbm.json -t "${pkgdir}/usr/share/egl/egl_external_platform.d"
     install -d -m755 "${pkgdir}/usr/lib/gbm"
     ln -s "../libnvidia-allocator.so.${pkgver}" "${pkgdir}/usr/lib/gbm/nvidia-drm_gbm.so"
diff --git a/nvidia.rules b/nvidia.rules
index 97218dfd31f7..f089d92c22f8 100644
--- a/nvidia.rules
+++ b/nvidia.rules
@@ -1,6 +1,5 @@
-# Make sure device nodes are present even when the DDX is not started for the Wayland/EGLStream case
-KERNEL=="nvidia", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 255'"
-KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \  -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia$${i} c $$(grep nvidia-frontend /proc/devices | cut -d \  -f 1) $${i}; done'"
-KERNEL=="nvidia_modeset", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 254'"
-KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 0'"
-KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 1'"
+# Device nodes are created by nvidia-modprobe, which is called by the nvidia DDX.
+# In case the DDX is not started, the device nodes are never created, so call
+# nvidia-modprobe in the udev rules to cover the Wayland/EGLStream and compute
+# case without a started display.
+KERNEL=="nvidia", RUN+="/usr/bin/nvidia-modprobe"