xf86-video-nvidia: update to 470.94

- dropped kernel 5.14 patch
- added missing libnvidia-glsi.so lib

packages/x11/driver/xf86-video-nvidia/package.mk

@@ -6,8 +6,8 @@ PKG_NAME="xf86-video-nvidia"
 # Remember to run "python3 packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit
 # changes to "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version.
 # The build host may require installation of python3-lxml and python3-requests packages.
-PKG_VERSION="460.91.03"
-PKG_SHA256="448156cfcef182ed6997c2754c472fd681bf7139b821d2adce1d847220c6c933"
+PKG_VERSION="470.94"
+PKG_SHA256="0b49cb861fdfea91753d3fddf7bd4251c3705cd93f0ebc7b5a52cbcdb7e4cf48"
 PKG_ARCH="x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="https://www.nvidia.com/en-us/drivers/unix/"
@@ -47,6 +47,7 @@ makeinstall_target() {
 
   mkdir -p ${INSTALL}/usr/lib
     cp -P libnvidia-glcore.so.${PKG_VERSION} ${INSTALL}/usr/lib
+    cp -P libnvidia-glsi.so.${PKG_VERSION} ${INSTALL}/usr/lib
     cp -P libnvidia-ml.so.${PKG_VERSION} ${INSTALL}/usr/lib
     ln -sf /var/lib/libnvidia-ml.so.1 ${INSTALL}/usr/lib/libnvidia-ml.so.1
     cp -P libnvidia-tls.so.${PKG_VERSION} ${INSTALL}/usr/lib

packages/x11/driver/xf86-video-nvidia/patches/nvidia-fix-linux-5.14.patch

@@ -1,63 +0,0 @@
-From f18c541edc5e122b06b0c1e65d0a422f0b8109e7 Mon Sep 17 00:00:00 2001
-From: Joan Bruguera <joanbrugueram@gmail.com>
-Date: Fri, 2 Jul 2021 02:09:58 +0200
-Subject: [PATCH] Tentative fix for NVIDIA 465.31 driver for Linux 5.14-rc1
-
----
- kernel/common/inc/nv-time.h        | 6 ++++++
- kernel/nvidia-drm/nvidia-drm-drv.c | 4 ++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/kernel/common/inc/nv-time.h b/kernel/common/inc/nv-time.h
-index dc80806..cc343a5 100644
---- a/kernel/common/inc/nv-time.h
-+++ b/kernel/common/inc/nv-time.h
-@@ -23,6 +23,7 @@
- #ifndef __NV_TIME_H__
- #define __NV_TIME_H__
- 
-+#include <linux/version.h>
- #include "conftest.h"
- #include <linux/sched.h>
- #include <linux/delay.h>
-@@ -205,7 +206,12 @@ static inline NV_STATUS nv_sleep_ms(unsigned int ms)
-         // the requested timeout has expired, loop until less
-         // than a jiffie of the desired delay remains.
-         //
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0))
-         current->state = TASK_INTERRUPTIBLE;
-+#else
-+        // Rel. commit "sched: Change task_struct::state" (Peter Zijlstra, Jun 11 2021)
-+        WRITE_ONCE(current->__state, TASK_INTERRUPTIBLE);
-+#endif
-         do
-         {
-             schedule_timeout(jiffies);
-diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
-index 84d4479..99ea552 100644
---- a/kernel/nvidia-drm/nvidia-drm-drv.c
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
-@@ -20,6 +20,7 @@
-  * DEALINGS IN THE SOFTWARE.
-  */
- 
-+#include <linux/version.h>
- #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */
- 
- #include "nvidia-drm-priv.h"
-@@ -903,9 +904,12 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
- 
-     dev->dev_private = nv_dev;
-     nv_dev->dev = dev;
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0))
-+    // Rel. commit "drm: Remove pdev field from struct drm_device" (Thomas Zimmermann, 3 May 2021)
-     if (device->bus == &pci_bus_type) {
-         dev->pdev = to_pci_dev(device);
-     }
-+#endif
- 
-     /* Register DRM device to DRM sub-system */
- 
--- 
-2.32.0
-

packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules

@@ -253,6 +253,7 @@ ATTR{device}=="0x1e91", GOTO="configure_nvidia"
 ATTR{device}=="0x1e93", GOTO="configure_nvidia"
 ATTR{device}=="0x1eb0", GOTO="configure_nvidia"
 ATTR{device}=="0x1eb1", GOTO="configure_nvidia"
+ATTR{device}=="0x1eb4", GOTO="configure_nvidia"
 ATTR{device}=="0x1eb5", GOTO="configure_nvidia"
 ATTR{device}=="0x1eb6", GOTO="configure_nvidia"
 ATTR{device}=="0x1eb8", GOTO="configure_nvidia"
@@ -263,6 +264,7 @@ ATTR{device}=="0x1ed1", GOTO="configure_nvidia"
 ATTR{device}=="0x1ed3", GOTO="configure_nvidia"
 ATTR{device}=="0x1ef5", GOTO="configure_nvidia"
 ATTR{device}=="0x1f02", GOTO="configure_nvidia"
+ATTR{device}=="0x1f03", GOTO="configure_nvidia"
 ATTR{device}=="0x1f06", GOTO="configure_nvidia"
 ATTR{device}=="0x1f07", GOTO="configure_nvidia"
 ATTR{device}=="0x1f08", GOTO="configure_nvidia"
@@ -300,13 +302,19 @@ ATTR{device}=="0x1fba", GOTO="configure_nvidia"
 ATTR{device}=="0x1fbb", GOTO="configure_nvidia"
 ATTR{device}=="0x1fbc", GOTO="configure_nvidia"
 ATTR{device}=="0x1fdd", GOTO="configure_nvidia"
+ATTR{device}=="0x1ff0", GOTO="configure_nvidia"
+ATTR{device}=="0x1ff2", GOTO="configure_nvidia"
 ATTR{device}=="0x1ff9", GOTO="configure_nvidia"
 ATTR{device}=="0x20b0", GOTO="configure_nvidia"
 ATTR{device}=="0x20b1", GOTO="configure_nvidia"
 ATTR{device}=="0x20b2", GOTO="configure_nvidia"
+ATTR{device}=="0x20b3", GOTO="configure_nvidia"
+ATTR{device}=="0x20b5", GOTO="configure_nvidia"
 ATTR{device}=="0x20b6", GOTO="configure_nvidia"
 ATTR{device}=="0x20b7", GOTO="configure_nvidia"
+ATTR{device}=="0x20f0", GOTO="configure_nvidia"
 ATTR{device}=="0x20f1", GOTO="configure_nvidia"
+ATTR{device}=="0x20f2", GOTO="configure_nvidia"
 ATTR{device}=="0x2182", GOTO="configure_nvidia"
 ATTR{device}=="0x2184", GOTO="configure_nvidia"
 ATTR{device}=="0x2187", GOTO="configure_nvidia"
@@ -319,17 +327,21 @@ ATTR{device}=="0x21d1", GOTO="configure_nvidia"
 ATTR{device}=="0x2204", GOTO="configure_nvidia"
 ATTR{device}=="0x2206", GOTO="configure_nvidia"
 ATTR{device}=="0x2208", GOTO="configure_nvidia"
+ATTR{device}=="0x220d", GOTO="configure_nvidia"
 ATTR{device}=="0x2216", GOTO="configure_nvidia"
 ATTR{device}=="0x2230", GOTO="configure_nvidia"
 ATTR{device}=="0x2231", GOTO="configure_nvidia"
+ATTR{device}=="0x2232", GOTO="configure_nvidia"
 ATTR{device}=="0x2235", GOTO="configure_nvidia"
 ATTR{device}=="0x2236", GOTO="configure_nvidia"
 ATTR{device}=="0x2237", GOTO="configure_nvidia"
 ATTR{device}=="0x2482", GOTO="configure_nvidia"
 ATTR{device}=="0x2484", GOTO="configure_nvidia"
 ATTR{device}=="0x2486", GOTO="configure_nvidia"
+ATTR{device}=="0x2487", GOTO="configure_nvidia"
 ATTR{device}=="0x2488", GOTO="configure_nvidia"
 ATTR{device}=="0x2489", GOTO="configure_nvidia"
+ATTR{device}=="0x248a", GOTO="configure_nvidia"
 ATTR{device}=="0x249c", GOTO="configure_nvidia"
 ATTR{device}=="0x249d", GOTO="configure_nvidia"
 ATTR{device}=="0x24b0", GOTO="configure_nvidia"
@@ -342,11 +354,14 @@ ATTR{device}=="0x2503", GOTO="configure_nvidia"
 ATTR{device}=="0x2504", GOTO="configure_nvidia"
 ATTR{device}=="0x2520", GOTO="configure_nvidia"
 ATTR{device}=="0x2523", GOTO="configure_nvidia"
+ATTR{device}=="0x2531", GOTO="configure_nvidia"
 ATTR{device}=="0x2560", GOTO="configure_nvidia"
 ATTR{device}=="0x2563", GOTO="configure_nvidia"
+ATTR{device}=="0x2571", GOTO="configure_nvidia"
 ATTR{device}=="0x25a0", GOTO="configure_nvidia"
 ATTR{device}=="0x25a2", GOTO="configure_nvidia"
 ATTR{device}=="0x25a5", GOTO="configure_nvidia"
+ATTR{device}=="0x25b6", GOTO="configure_nvidia"
 ATTR{device}=="0x25b8", GOTO="configure_nvidia"
 ATTR{device}=="0x25e0", GOTO="configure_nvidia"
 ATTR{device}=="0x25e2", GOTO="configure_nvidia"