[packages/xorg-driver-video-nvidia-legacy-390xx] - arch dependent fixes for kernel 6.15 - rel 13
baggins
baggins at pld-linux.org
Sat Jun 14 14:39:20 CEST 2025
commit 18ea80930b073594b9e27f67495305181e632acd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Jun 14 15:53:54 2025 +0200
- arch dependent fixes for kernel 6.15
- rel 13
kernel-6.15-uvm.patch | 42 ++++++++++++++++++++++++++++++
kernel-6.15-x86.patch | 40 ++++++++++++++++++++++++++++
kernel-6.15.patch | 42 ------------------------------
xorg-driver-video-nvidia-legacy-390xx.spec | 6 ++++-
4 files changed, 87 insertions(+), 43 deletions(-)
---
diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index 91ce0db..3975cc2 100644
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -29,7 +29,7 @@ exit 1
%define no_install_post_check_so 1
-%define rel 12
+%define rel 13
%define pname xorg-driver-video-nvidia-legacy-390xx
Summary: Linux Drivers for nVidia GeForce/Quadro Chips
Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez
@@ -68,6 +68,7 @@ Patch15: kernel-6.14.patch
Patch16: gcc15.patch
Patch17: kernel-6.15.patch
Patch18: kernel-6.15-uvm.patch
+Patch19: kernel-6.15-x86.patch
URL: https://www.nvidia.com/en-us/drivers/unix/
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 1.752
@@ -356,6 +357,9 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
%ifarch %{x8664}
%patch -P 18 -p1
%endif
+%ifarch %{ix86}
+%patch -P 19 -p1
+%endif
echo 'EXTRA_CFLAGS += -Wno-int-conversion' >> kernel/Kbuild
%build
diff --git a/kernel-6.15-uvm.patch b/kernel-6.15-uvm.patch
index 3c82b5e..6d6963b 100644
--- a/kernel-6.15-uvm.patch
+++ b/kernel-6.15-uvm.patch
@@ -1,3 +1,45 @@
+diff --git a/kernel/Kbuild b/kernel/Kbuild
+index baa6986..7324345 100644
+--- a/kernel/Kbuild
++++ b/kernel/Kbuild
+@@ -54,28 +54,21 @@ $(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 += -std=gnu17
+-EXTRA_CFLAGS += -I$(src)/common/inc
+-EXTRA_CFLAGS += -I$(src)
+-EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
+-EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM -DNV_VERSION_STRING=\"390.157\" -Wno-unused-function -Wuninitialized -fno-strict-aliasing -mno-red-zone -mcmodel=kernel -DNV_UVM_ENABLE -Wno-sign-compare -Wno-format-extra-args
+-EXTRA_CFLAGS += $(call cc-option,-Werror=undef,)
+-EXTRA_CFLAGS += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2)
+-EXTRA_CFLAGS += -DNV_KERNEL_INTERFACE_LAYER
++ccflags-y += -std=gnu17
++ccflags-y += -I$(src)/common/inc
++ccflags-y += -I$(src)
++ccflags-y += -Wall -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error -Wno-format-extra-args
++ccflags-y += -D__KERNEL__ -DMODULE -DNVRM -DNV_VERSION_STRING=\"390.157\" -Wno-unused-function -Wuninitialized -fno-strict-aliasing -mno-red-zone -mcmodel=kernel -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
+
+
diff --git a/kernel/nvidia-uvm/uvm8.c b/kernel/nvidia-uvm/uvm8.c
index 49e1047..4e84bbd 100644
--- a/kernel/nvidia-uvm/uvm8.c
diff --git a/kernel-6.15-x86.patch b/kernel-6.15-x86.patch
new file mode 100644
index 0000000..207d361
--- /dev/null
+++ b/kernel-6.15-x86.patch
@@ -0,0 +1,40 @@
+--- NVIDIA-Linux-x86-390.157/kernel/Kbuild.orig 2025-06-14 15:50:06.049998893 +0200
++++ NVIDIA-Linux-x86-390.157/kernel/Kbuild 2025-06-14 15:51:59.056665540 +0200
+@@ -54,28 +54,21 @@
+ $(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 += -std=gnu17
+-EXTRA_CFLAGS += -I$(src)/common/inc
+-EXTRA_CFLAGS += -I$(src)
+-EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
+-EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM -DNV_VERSION_STRING=\"390.157\" -Wno-unused-function -Wuninitialized -fno-strict-aliasing -Wno-sign-compare -Wno-format-extra-args
+-EXTRA_CFLAGS += $(call cc-option,-Werror=undef,)
+-EXTRA_CFLAGS += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2)
+-EXTRA_CFLAGS += -DNV_KERNEL_INTERFACE_LAYER
++ccflags-y += -std=gnu17
++ccflags-y += -I$(src)/common/inc
++ccflags-y += -I$(src)
++ccflags-y += -Wall -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
++ccflags-y += -D__KERNEL__ -DMODULE -DNVRM -DNV_VERSION_STRING=\"390.157\" -Wno-unused-function -Wuninitialized -fno-strict-aliasing -Wno-sign-compare -Wno-format-extra-args
++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
+
+
diff --git a/kernel-6.15.patch b/kernel-6.15.patch
index aa0519f..7e7ebec 100644
--- a/kernel-6.15.patch
+++ b/kernel-6.15.patch
@@ -1,45 +1,3 @@
-diff --git a/kernel/Kbuild b/kernel/Kbuild
-index baa6986..7324345 100644
---- a/kernel/Kbuild
-+++ b/kernel/Kbuild
-@@ -54,28 +54,21 @@ $(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 += -std=gnu17
--EXTRA_CFLAGS += -I$(src)/common/inc
--EXTRA_CFLAGS += -I$(src)
--EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
--EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM -DNV_VERSION_STRING=\"390.157\" -Wno-unused-function -Wuninitialized -fno-strict-aliasing -mno-red-zone -mcmodel=kernel -DNV_UVM_ENABLE -Wno-sign-compare -Wno-format-extra-args
--EXTRA_CFLAGS += $(call cc-option,-Werror=undef,)
--EXTRA_CFLAGS += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2)
--EXTRA_CFLAGS += -DNV_KERNEL_INTERFACE_LAYER
-+ccflags-y += -std=gnu17
-+ccflags-y += -I$(src)/common/inc
-+ccflags-y += -I$(src)
-+ccflags-y += -Wall -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error -Wno-format-extra-args
-+ccflags-y += -D__KERNEL__ -DMODULE -DNVRM -DNV_VERSION_STRING=\"390.157\" -Wno-unused-function -Wuninitialized -fno-strict-aliasing -mno-red-zone -mcmodel=kernel -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
-
-
diff --git a/kernel/common/inc/nv-mm.h b/kernel/common/inc/nv-mm.h
index acd396d..1e955a4 100644
--- a/kernel/common/inc/nv-mm.h
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia-legacy-390xx.git/commitdiff/18ea80930b073594b9e27f67495305181e632acd
More information about the pld-cvs-commit
mailing list