diff --git a/packages/graphics/nvidia/package.mk b/packages/graphics/nvidia/package.mk index 21c3ec50e2..7f4e88b9bd 100644 --- a/packages/graphics/nvidia/package.mk +++ b/packages/graphics/nvidia/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nvidia" -PKG_VERSION="575.57.08" -PKG_SHA256="d0a0f44a1e3e0ef3670be182e2a55285c46312bde6ac4991193fb03add52757b" +PKG_VERSION="575.64" +PKG_SHA256="d23ce700dffb52c3780813633ace06f3b7337fdf668f9a61694fc1cd3a0832ae" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="https://www.nvidia.com/en-us/drivers/unix/" @@ -63,8 +63,8 @@ makeinstall_target() { # Wayland mkdir -p ${INSTALL}/usr/lib - cp -p libnvidia-egl-wayland.so.1.1.18 ${INSTALL}/usr/lib/ - ln -sf libnvidia-egl-wayland.so.1.1.18 ${INSTALL}/usr/lib/libnvidia-egl-wayland.so.1 + cp -p libnvidia-egl-wayland.so.1.1.19 ${INSTALL}/usr/lib/ + ln -sf libnvidia-egl-wayland.so.1.1.19 ${INSTALL}/usr/lib/libnvidia-egl-wayland.so.1 ln -sf libnvidia-egl-wayland.so.1 ${INSTALL}/usr/lib/libnvidia-egl-wayland.so mkdir -p ${INSTALL}/usr/share/egl/egl_external_platform.d diff --git a/packages/graphics/nvidia/patches/001-Workaround-nv_vm_flags_-calling-GPL-only-code.patch b/packages/graphics/nvidia/patches/001-Workaround-nv_vm_flags_-calling-GPL-only-code.patch deleted file mode 100644 index 62d46455a8..0000000000 --- a/packages/graphics/nvidia/patches/001-Workaround-nv_vm_flags_-calling-GPL-only-code.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- a/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c -+++ b/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c -@@ -44,6 +44,13 @@ - #include - #endif - -+#include -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0) -+#define nv_vm_flags_set(v, f) vm_flags_reset((v), (v)->vm_flags | (f)) -+#define nv_vm_flags_clear(v, f) vm_flags_reset((v), (v)->vm_flags & ~(f)) -+#endif -+ - static inline - void __nv_drm_gem_user_memory_free(struct nv_drm_gem_object *nv_gem) - { ---- a/kernel/nvidia-drm/nvidia-drm-gem.c -+++ b/kernel/nvidia-drm/nvidia-drm-gem.c -@@ -51,6 +51,13 @@ - - #include "nv-mm.h" - -+#include -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0) -+#define nv_vm_flags_set(v, f) vm_flags_reset((v), (v)->vm_flags | (f)) -+#define nv_vm_flags_clear(v, f) vm_flags_reset((v), (v)->vm_flags & ~(f)) -+#endif -+ - void nv_drm_gem_free(struct drm_gem_object *gem) - { - struct nv_drm_gem_object *nv_gem = to_nv_gem_object(gem); ---- a/kernel/nvidia-uvm/uvm.c -+++ b/kernel/nvidia-uvm/uvm.c -@@ -21,6 +21,8 @@ - - *******************************************************************************/ - -+#include -+ - #include "uvm_api.h" - #include "uvm_global.h" - #include "uvm_gpu_replayable_faults.h" -@@ -40,6 +42,11 @@ - - #define NVIDIA_UVM_DEVICE_NAME "nvidia-uvm" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0) -+#define nv_vm_flags_set(v, f) vm_flags_reset((v), (v)->vm_flags | (f)) -+#define nv_vm_flags_clear(v, f) vm_flags_reset((v), (v)->vm_flags & ~(f)) -+#endif -+ - static dev_t g_uvm_base_dev; - static struct cdev g_uvm_cdev; - static const struct file_operations uvm_fops; ---- a/kernel/nvidia/nv-mmap.c -+++ b/kernel/nvidia/nv-mmap.c -@@ -23,10 +23,17 @@ - - #define __NO_VERSION__ - -+#include -+ - #include "os-interface.h" - #include "nv-linux.h" - #include "nv_speculation_barrier.h" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0) -+#define nv_vm_flags_set(v, f) vm_flags_reset((v), (v)->vm_flags | (f)) -+#define nv_vm_flags_clear(v, f) vm_flags_reset((v), (v)->vm_flags & ~(f)) -+#endif -+ - /* - * The 'struct vm_operations' open() callback is called by the Linux - * kernel when the parent VMA is split or copied, close() when the