diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index 18253cb22d..5e03023d64 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/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="470.129.06" -PKG_SHA256="6ac030d692d45c065ad88d30fb7358834df9ceb4f37caaad459a4d7c64877ea7" +PKG_VERSION="470.141.03" +PKG_SHA256="87056cfd6f9fb915946b01adbad01cdc6a13db2f1c00c21dce9367692b7ca42d" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="https://www.nvidia.com/en-us/drivers/unix/" diff --git a/packages/x11/driver/xf86-video-nvidia/patches/nvidia-470xx-fix-linux-5.19.patch b/packages/x11/driver/xf86-video-nvidia/patches/nvidia-470xx-fix-linux-5.19.patch deleted file mode 100644 index 23e6c5c4bc..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches/nvidia-470xx-fix-linux-5.19.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/kernel/nvidia-drm/nvidia-dma-resv-helper.h 2022-05-12 22:42:02.000000000 +0000 -+++ b/kernel/nvidia-drm/nvidia-dma-resv-helper.h 2022-06-29 08:19:44.859696269 +0000 -@@ -23,6 +23,7 @@ - #ifndef __NVIDIA_DMA_RESV_HELPER_H__ - #define __NVIDIA_DMA_RESV_HELPER_H__ - -+#include - #include "nvidia-drm-conftest.h" - - #if defined(NV_DRM_FENCE_AVAILABLE) -@@ -69,7 +70,11 @@ - nv_dma_fence_t *fence) - { - #if defined(NV_LINUX_DMA_RESV_H_PRESENT) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)) -+ dma_resv_add_fence(obj, fence, DMA_RESV_USAGE_WRITE); -+#else - dma_resv_add_excl_fence(obj, fence); -+#endif - #else - reservation_object_add_excl_fence(obj, fence); - #endif diff --git a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules index 9fd0d4168d..d1796652e1 100644 --- a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules +++ b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules @@ -369,6 +369,7 @@ ATTR{device}=="0x24fa", GOTO="configure_nvidia" ATTR{device}=="0x2503", GOTO="configure_nvidia" ATTR{device}=="0x2504", GOTO="configure_nvidia" ATTR{device}=="0x2507", GOTO="configure_nvidia" +ATTR{device}=="0x2508", GOTO="configure_nvidia" ATTR{device}=="0x2520", GOTO="configure_nvidia" ATTR{device}=="0x2523", GOTO="configure_nvidia" ATTR{device}=="0x2531", GOTO="configure_nvidia"