From ff3e04c4174d76e08e27cf3e48fe29858b425ac3 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 20 May 2025 11:29:22 +0000 Subject: [PATCH 1/2] nvidia: update to 570.153.02 --- packages/graphics/nvidia/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/nvidia/package.mk b/packages/graphics/nvidia/package.mk index b6a864a6cf..ab1122fabe 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="570.144" -PKG_SHA256="f3532d135c934c1a25480275da3cf8edb32aa6c5fccef64f657463c26e26fb70" +PKG_VERSION="570.153.02" +PKG_SHA256="a3da14144fd64a8da23b336e793981dc6f8ee9275e1beae971ad3c1fc375ef22" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="https://www.nvidia.com/en-us/drivers/unix/" From 3d935eec8b481bd6d39a510b2ce5ceb740f57177 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 20 May 2025 11:30:17 +0000 Subject: [PATCH 2/2] xf86-video-nvidia: update to 570.153.02 --- .../x11/driver/xf86-video-nvidia/package.mk | 4 +- ...idia-kernel-ccflags-y-fix-linux-6.14.patch | 235 ------------------ 2 files changed, 2 insertions(+), 237 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-nvidia/patches/nvidia-kernel-ccflags-y-fix-linux-6.14.patch diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index 961505d649..c95a10a994 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xf86-video-nvidia" -PKG_VERSION="570.144" -PKG_SHA256="f3532d135c934c1a25480275da3cf8edb32aa6c5fccef64f657463c26e26fb70" +PKG_VERSION="570.153.02" +PKG_SHA256="a3da14144fd64a8da23b336e793981dc6f8ee9275e1beae971ad3c1fc375ef22" 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-kernel-ccflags-y-fix-linux-6.14.patch b/packages/x11/driver/xf86-video-nvidia/patches/nvidia-kernel-ccflags-y-fix-linux-6.14.patch deleted file mode 100644 index d36b4d3d6b..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches/nvidia-kernel-ccflags-y-fix-linux-6.14.patch +++ /dev/null @@ -1,235 +0,0 @@ -diff -Naur nvidia-kmod-570.133.07-x86_64.old/kernel/Kbuild nvidia-kmod-570.133.07-x86_64/kernel/Kbuild ---- nvidia-kmod-570.133.07-x86_64.old/kernel/Kbuild 2025-04-12 09:54:19.974786018 +0200 -+++ nvidia-kmod-570.133.07-x86_64/kernel/Kbuild 2025-04-12 09:56:58.900332108 +0200 -@@ -74,22 +74,15 @@ - $(foreach _module, $(NV_KERNEL_MODULES), \ - $(eval include $(src)/$(_module)/$(_module).Kbuild)) - -- --# --# Define CFLAGS that apply to all the NVIDIA kernel modules. EXTRA_CFLAGS --# is deprecated since 2.6.24 in favor of ccflags-y, but we need to support --# older kernels which do not have ccflags-y. Newer kernels append --# $(EXTRA_CFLAGS) to ccflags-y for compatibility. --# -- --EXTRA_CFLAGS += -I$(src)/common/inc --EXTRA_CFLAGS += -I$(src) --EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args --EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM --EXTRA_CFLAGS += -DNV_VERSION_STRING=\"570.144\" -+ccflags-y += -std=gnu17 -+ccflags-y += -I$(src)/common/inc -+ccflags-y += -I$(src) -+ccflags-y += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args -+ccflags-y += -D__KERNEL__ -DMODULE -DNVRM -+ccflags-y += -DNV_VERSION_STRING=\"570.144\" - - ifneq ($(SYSSRCHOST1X),) -- EXTRA_CFLAGS += -I$(SYSSRCHOST1X) -+ ccflags-y += -I$(SYSSRCHOST1X) - endif - - # Some Android kernels prohibit driver use of filesystem functions like -@@ -99,57 +92,57 @@ - PLATFORM_IS_ANDROID ?= 0 - - ifeq ($(PLATFORM_IS_ANDROID),1) -- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 -+ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 - else -- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 -+ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 - endif - --EXTRA_CFLAGS += -Wno-unused-function -+ccflags-y += -Wno-unused-function - - ifneq ($(NV_BUILD_TYPE),debug) -- EXTRA_CFLAGS += -Wuninitialized -+ ccflags-y += -Wuninitialized - endif - --EXTRA_CFLAGS += -fno-strict-aliasing -+ccflags-y += -fno-strict-aliasing - - ifeq ($(ARCH),arm64) -- EXTRA_CFLAGS += -mstrict-align -+ ccflags-y += -mstrict-align - endif - - ifeq ($(NV_BUILD_TYPE),debug) -- EXTRA_CFLAGS += -g -+ ccflags-y += -g - endif - --EXTRA_CFLAGS += -ffreestanding -+ccflags-y += -ffreestanding - - ifeq ($(ARCH),arm64) -- EXTRA_CFLAGS += -mgeneral-regs-only -march=armv8-a -- EXTRA_CFLAGS += $(call cc-option,-mno-outline-atomics,) -+ ccflags-y += -mgeneral-regs-only -march=armv8-a -+ ccflags-y += $(call cc-option,-mno-outline-atomics,) - endif - - ifeq ($(ARCH),x86_64) -- EXTRA_CFLAGS += -mno-red-zone -mcmodel=kernel -+ ccflags-y += -mno-red-zone -mcmodel=kernel - endif - - ifeq ($(ARCH),powerpc) -- EXTRA_CFLAGS += -mlittle-endian -mno-strict-align -+ ccflags-y += -mlittle-endian -mno-strict-align - endif - --EXTRA_CFLAGS += -DNV_UVM_ENABLE --EXTRA_CFLAGS += $(call cc-option,-Werror=undef,) --EXTRA_CFLAGS += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) --EXTRA_CFLAGS += -DNV_KERNEL_INTERFACE_LAYER -+ccflags-y += -DNV_UVM_ENABLE -+ccflags-y += $(call cc-option,-Werror=undef,) -+ccflags-y += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) -+ccflags-y += -DNV_KERNEL_INTERFACE_LAYER - - # - # Detect SGI UV systems and apply system-specific optimizations. - # - - ifneq ($(wildcard /proc/sgi_uv),) -- EXTRA_CFLAGS += -DNV_CONFIG_X86_UV -+ ccflags-y += -DNV_CONFIG_X86_UV - endif - - ifdef VGX_FORCE_VFIO_PCI_CORE -- EXTRA_CFLAGS += -DNV_VGPU_FORCE_VFIO_PCI_CORE -+ ccflags-y += -DNV_VGPU_FORCE_VFIO_PCI_CORE - endif - - WARNINGS_AS_ERRORS ?= -@@ -183,7 +176,7 @@ - - NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags) - --NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie -+NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(ccflags-y) -fno-pie - NV_CONFTEST_CFLAGS += $(call cc-disable-warning,pointer-sign) - NV_CONFTEST_CFLAGS += $(call cc-option,-fshort-wchar,) - NV_CONFTEST_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types,) -diff -Naur nvidia-kmod-570.133.07-x86_64.old/kernel-open/Kbuild nvidia-kmod-570.133.07-x86_64/kernel-open/Kbuild ---- nvidia-kmod-570.133.07-x86_64.old/kernel-open/Kbuild 2025-04-12 09:54:20.039786545 +0200 -+++ nvidia-kmod-570.133.07-x86_64/kernel-open/Kbuild 2025-04-12 09:56:51.436478034 +0200 -@@ -75,21 +75,15 @@ - $(eval include $(src)/$(_module)/$(_module).Kbuild)) - - --# --# Define CFLAGS that apply to all the NVIDIA kernel modules. EXTRA_CFLAGS --# is deprecated since 2.6.24 in favor of ccflags-y, but we need to support --# older kernels which do not have ccflags-y. Newer kernels append --# $(EXTRA_CFLAGS) to ccflags-y for compatibility. --# -- --EXTRA_CFLAGS += -I$(src)/common/inc --EXTRA_CFLAGS += -I$(src) --EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args --EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM --EXTRA_CFLAGS += -DNV_VERSION_STRING=\"570.144\" -+ccflags-y += -std=gnu17 -+ccflags-y += -I$(src)/common/inc -+ccflags-y += -I$(src) -+ccflags-y += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args -+ccflags-y += -D__KERNEL__ -DMODULE -DNVRM -+ccflags-y += -DNV_VERSION_STRING=\"570.144\" - - ifneq ($(SYSSRCHOST1X),) -- EXTRA_CFLAGS += -I$(SYSSRCHOST1X) -+ ccflags-y += -I$(SYSSRCHOST1X) - endif - - # Some Android kernels prohibit driver use of filesystem functions like -@@ -99,57 +93,57 @@ - PLATFORM_IS_ANDROID ?= 0 - - ifeq ($(PLATFORM_IS_ANDROID),1) -- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 -+ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 - else -- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 -+ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 - endif - --EXTRA_CFLAGS += -Wno-unused-function -+ccflags-y += -Wno-unused-function - - ifneq ($(NV_BUILD_TYPE),debug) -- EXTRA_CFLAGS += -Wuninitialized -+ ccflags-y += -Wuninitialized - endif - --EXTRA_CFLAGS += -fno-strict-aliasing -+ccflags-y += -fno-strict-aliasing - - ifeq ($(ARCH),arm64) -- EXTRA_CFLAGS += -mstrict-align -+ ccflags-y += -mstrict-align - endif - - ifeq ($(NV_BUILD_TYPE),debug) -- EXTRA_CFLAGS += -g -+ ccflags-y += -g - endif - --EXTRA_CFLAGS += -ffreestanding -+ccflags-y += -ffreestanding - - ifeq ($(ARCH),arm64) -- EXTRA_CFLAGS += -mgeneral-regs-only -march=armv8-a -- EXTRA_CFLAGS += $(call cc-option,-mno-outline-atomics,) -+ ccflags-y += -mgeneral-regs-only -march=armv8-a -+ ccflags-y += $(call cc-option,-mno-outline-atomics,) - endif - - ifeq ($(ARCH),x86_64) -- EXTRA_CFLAGS += -mno-red-zone -mcmodel=kernel -+ ccflags-y += -mno-red-zone -mcmodel=kernel - endif - - ifeq ($(ARCH),powerpc) -- EXTRA_CFLAGS += -mlittle-endian -mno-strict-align -+ ccflags-y += -mlittle-endian -mno-strict-align - endif - --EXTRA_CFLAGS += -DNV_UVM_ENABLE --EXTRA_CFLAGS += $(call cc-option,-Werror=undef,) --EXTRA_CFLAGS += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) --EXTRA_CFLAGS += -DNV_KERNEL_INTERFACE_LAYER -+ccflags-y += -DNV_UVM_ENABLE -+ccflags-y += $(call cc-option,-Werror=undef,) -+ccflags-y += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) -+ccflags-y += -DNV_KERNEL_INTERFACE_LAYER - - # - # Detect SGI UV systems and apply system-specific optimizations. - # - - ifneq ($(wildcard /proc/sgi_uv),) -- EXTRA_CFLAGS += -DNV_CONFIG_X86_UV -+ ccflags-y += -DNV_CONFIG_X86_UV - endif - - ifdef VGX_FORCE_VFIO_PCI_CORE -- EXTRA_CFLAGS += -DNV_VGPU_FORCE_VFIO_PCI_CORE -+ ccflags-y += -DNV_VGPU_FORCE_VFIO_PCI_CORE - endif - - WARNINGS_AS_ERRORS ?= -@@ -183,7 +177,7 @@ - - NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags) - --NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie -+NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(ccflags-y) -fno-pie - NV_CONFTEST_CFLAGS += $(call cc-disable-warning,pointer-sign) - NV_CONFTEST_CFLAGS += $(call cc-option,-fshort-wchar,) - NV_CONFTEST_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types,)