Sven-Hendrik Haase pushed to branch main at Arch Linux / Packaging / Packages / 
nvidia-open


Commits:
8ca859fb by Martin Rys at 2024-10-03T17:59:40+00:00
Add patch by Nvidia to silence assert event errors only fixed in 570.xx

- - - - -


2 changed files:

- PKGBUILD
- + silence-event-assert-until-570.patch


Changes:

=====================================
PKGBUILD
=====================================
@@ -12,11 +12,13 @@ license=('MIT AND GPL-2.0-only')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${pkgver}.tar.gz";
         nvidia-open-gcc-ibt-sls.patch
         make-modeset-fbdev-default.patch
-        6.11-fbdev.patch)
+        6.11-fbdev.patch
+        silence-event-assert-until-570.patch)
 
sha512sums=('a0cbe05fc8acbb4769fa5320d6bfe2033fd31775036e984278cdf7e67ebd801bd8991d4d1626884a4ff729d3900c969f385caea7ae049e3d918a1ea60e45890a'
             
'263c4c5e75ef8cb8ca2641c022dfaf8bd9222fadf68ed15120b0ae7dd9cc901a04ce2e55625d513a0995759c9d82dfbdc4c33d4751159124915d7404b1400e34'
             
'f19a7d52c6e7f5bd6818658c2b11adaaf4ad05016ec0acc73a42417748ed4bf81b8394c077a6f5aba9dfcf6ab01a578692ed1e9d3c2ab583fdaa56166bba05f2'
-            
'3b6357627ad4672d864b985088908d43f7718dc428e8901c9d27101fd2e9bc109c84e2b414688bbcaa9a05c1e7e55434fff06bf1df5ed33175f1e8bac95dc557')
+            
'3b6357627ad4672d864b985088908d43f7718dc428e8901c9d27101fd2e9bc109c84e2b414688bbcaa9a05c1e7e55434fff06bf1df5ed33175f1e8bac95dc557'
+            
'8f0d0a4881588e10681060d6006a6c65108a753c3106a1a710cf90f8dba8e52e6d6c10633f8ad19b763a2ab119ef98fddc6db4481262daf644c0206ac2ecd2d9')
 
 prepare() {
   cd open-gpu-kernel-modules-${pkgver}
@@ -33,6 +35,10 @@ prepare() {
   # Fix for 
https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/80
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/6.11-fbdev.patch
 
+  # Patch by Nvidia to silence error messages until a real fix drops in 570.xx
+       # 
https://github.com/NVIDIA/open-gpu-kernel-modules/issues/716#issuecomment-2391898884
+  patch -Np1 --no-backup-if-mismatch -i 
"$srcdir"/silence-event-assert-until-570.patch
+
   # Attempt to make this reproducible
   sed -i "s/^HOSTNAME.*/HOSTNAME = echo archlinux"/ utils.mk
   sed -i "s/^WHOAMI.*/WHOAMI = echo archlinux-builder"/ utils.mk


=====================================
silence-event-assert-until-570.patch
=====================================
@@ -0,0 +1,18 @@
+diff --git a/src/nvidia/src/kernel/rmapi/event_notification.c 
b/src/nvidia/src/kernel/rmapi/event_notification.c
+index cf78eadd..d6937cac 100644
+--- a/src/nvidia/src/kernel/rmapi/event_notification.c
++++ b/src/nvidia/src/kernel/rmapi/event_notification.c
+@@ -286,11 +286,11 @@ static NV_STATUS _gpuEngineEventNotificationListNotify
+     portSyncSpinlockAcquire(pEventNotificationList->pSpinlock);
+     {
+         // We don't expect this to be called multiple times in parallel
+-        NV_ASSERT_OR_ELSE(pEventNotificationList->pendingEventNotifyCount == 
0,
++        if (pEventNotificationList->pendingEventNotifyCount != 0)
+         {
+             portSyncSpinlockRelease(pEventNotificationList->pSpinlock);
+             return NV_ERR_INVALID_STATE;
+-        });
++        }
+
+         EngineEventNotificationListIter it =
+             listIterAll(&pEventNotificationList->eventNotificationList);



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia-open/-/commit/8ca859fb77fced66c25ed1868dfa15fdee6cd986

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia-open/-/commit/8ca859fb77fced66c25ed1868dfa15fdee6cd986
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to