[xorg-x11-drv-nvidia] Revert "fix"
by Leigh Scott
commit 26bb9bb3e00b77a3b9164d639a1601bdd946ad4b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 8 12:26:26 2025 +0000
Revert "fix"
This reverts commit 4e26fef9d48f88f524e94dbff9485ba7b6268467.
xorg-x11-drv-nvidia.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 91e2ed9..500f058 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -288,14 +288,14 @@ ln -sf ../libnvidia-allocator.so.%{version} %{buildroot}%{_libdir}/gbm/nvidia-dr
popd
%endif
+# Vulkan loader
+install -p -m 0644 -D nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.json
+
# EGL config for libglvnd
install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
%ifarch x86_64 aarch64
-# Vulkan loader
-install -p -m 0644 -D nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.json
-
# Vulkan layer
install -p -m 0644 -D nvidia_layers.json %{buildroot}%{_datadir}/vulkan/implicit_layer.d/nvidia_layers.json
@@ -490,7 +490,6 @@ fi ||:
%{_libdir}/vdpau/libvdpau_nvidia.so.%{version}
%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
%ifarch x86_64 aarch64
-%{_datadir}/vulkan/icd.d/nvidia_icd.json
%{_datadir}/vulkan/implicit_layer.d/nvidia_layers.json
%{_libdir}/libnvidia-api.so.1
%{_libdir}/libnvidia-cfg.so.1
@@ -501,6 +500,7 @@ fi ||:
%{_libdir}/libnvoptix.so.1
%{_libdir}/libnvoptix.so.%{version}
%ifarch x86_64
+%{_datadir}/vulkan/icd.d/nvidia_icd.json
%{_datadir}/vulkansc/icd.d/nvidia_icd_vksc.json
%{_libdir}/libnvidia-vksc-core.so.%{version}
%{_libdir}/libnvidia-vksc-core.so.1
3 weeks, 2 days
[nvidia-kmod] Redo patch so it still builds on kernels < 6.11
by Leigh Scott
commit 853d6c143f5c8efbd109ce132078c75980b6f31c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 8 10:43:52 2025 +0000
Redo patch so it still builds on kernels < 6.11
remove_unused_date.patch | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/remove_unused_date.patch b/remove_unused_date.patch
index f96c378..1be5d22 100644
--- a/remove_unused_date.patch
+++ b/remove_unused_date.patch
@@ -1,11 +1,21 @@
diff -uNrp a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
--- a/kernel/nvidia-drm/nvidia-drm-drv.c 2025-01-24 20:50:25.000000000 +0000
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c 2025-02-08 10:17:24.485305841 +0000
-@@ -1915,7 +1915,6 @@ static struct drm_driver nv_drm_driver =
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c 2025-02-08 10:40:30.455105183 +0000
+@@ -86,6 +86,7 @@
+ #include <drm/drm_fbdev_generic.h>
+ #endif
+
++#include <linux/version.h>
+ #include <linux/pci.h>
+ #include <linux/workqueue.h>
+
+@@ -1915,7 +1916,9 @@ static struct drm_driver nv_drm_driver =
.name = "nvidia-drm",
.desc = "NVIDIA DRM driver",
-- .date = "20160202",
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
+ .date = "20160202",
++#endif
#if defined(NV_DRM_DRIVER_HAS_DEVICE_LIST)
.device_list = LIST_HEAD_INIT(nv_drm_driver.device_list),
3 weeks, 2 days
[nvidia-kmod] Remove unused date
by Leigh Scott
commit e17709c57fe1207f228ec3f180dfd290c51aa6b9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 8 10:25:30 2025 +0000
Remove unused date
nvidia-kmod.spec | 7 ++++++-
remove_unused_date.patch | 11 +++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index d799f81..9b25a87 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,13 +12,14 @@ Name: nvidia-kmod
Epoch: 3
Version: 570.86.16
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: https://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: make_modeset_default.patch
+Patch1: remove_unused_date.patch
ExclusiveArch: x86_64 aarch64
@@ -52,6 +53,7 @@ echo "Using original nvidia defaults"
echo "Set nvidia to modeset=1"
%patch -P0 -p1
%endif
+%patch -P1 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -87,6 +89,9 @@ done
%changelog
+* Sat Feb 08 2025 Leigh Scott <leigh123linux(a)gmail.com> - 3:570.86.16-3
+- Remove unused date
+
* Sat Feb 08 2025 Leigh Scott <leigh123linux(a)gmail.com> - 3:570.86.16-2
- Force build to use std=gnu17
diff --git a/remove_unused_date.patch b/remove_unused_date.patch
new file mode 100644
index 0000000..f96c378
--- /dev/null
+++ b/remove_unused_date.patch
@@ -0,0 +1,11 @@
+diff -uNrp a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c 2025-01-24 20:50:25.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c 2025-02-08 10:17:24.485305841 +0000
+@@ -1915,7 +1915,6 @@ static struct drm_driver nv_drm_driver =
+ .name = "nvidia-drm",
+
+ .desc = "NVIDIA DRM driver",
+- .date = "20160202",
+
+ #if defined(NV_DRM_DRIVER_HAS_DEVICE_LIST)
+ .device_list = LIST_HEAD_INIT(nv_drm_driver.device_list),
3 weeks, 2 days
[nvidia-kmod] Force build to use std=gnu17
by Leigh Scott
commit 29ad34afa83f126438067bacd46d5afe8d09332d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 8 08:16:22 2025 +0000
Force build to use std=gnu17
nvidia-kmod.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index d5fa68d..d799f81 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-kmod
Epoch: 3
Version: 570.86.16
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: https://www.nvidia.com/
@@ -58,6 +58,7 @@ for kernel_version in %{?kernel_versions} ; do
done
%build
+export CC+=" -std=gnu17"
%if 0%{?_without_nvidia_uvm:1}
export NV_EXCLUDE_KERNEL_MODULES="${NV_EXCLUDE_KERNEL_MODULES} nvidia_uvm "
%endif
@@ -86,6 +87,9 @@ done
%changelog
+* Sat Feb 08 2025 Leigh Scott <leigh123linux(a)gmail.com> - 3:570.86.16-2
+- Force build to use std=gnu17
+
* Thu Jan 30 2025 Leigh Scott <leigh123linux(a)gmail.com> - 3:570.86.16-1
- Update to 570.86.16 beta
3 weeks, 3 days
[xorg-x11-drv-nvidia/f42] fix
by Leigh Scott
Summary of changes:
4e26fef... fix (*)
(*) This commit already existed in another branch; no separate mail sent
3 weeks, 3 days
[xorg-x11-drv-nvidia] fix
by Leigh Scott
commit 4e26fef9d48f88f524e94dbff9485ba7b6268467
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 8 07:51:26 2025 +0000
fix
xorg-x11-drv-nvidia.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 500f058..91e2ed9 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -288,14 +288,14 @@ ln -sf ../libnvidia-allocator.so.%{version} %{buildroot}%{_libdir}/gbm/nvidia-dr
popd
%endif
-# Vulkan loader
-install -p -m 0644 -D nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.json
-
# EGL config for libglvnd
install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
%ifarch x86_64 aarch64
+# Vulkan loader
+install -p -m 0644 -D nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.json
+
# Vulkan layer
install -p -m 0644 -D nvidia_layers.json %{buildroot}%{_datadir}/vulkan/implicit_layer.d/nvidia_layers.json
@@ -490,6 +490,7 @@ fi ||:
%{_libdir}/vdpau/libvdpau_nvidia.so.%{version}
%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
%ifarch x86_64 aarch64
+%{_datadir}/vulkan/icd.d/nvidia_icd.json
%{_datadir}/vulkan/implicit_layer.d/nvidia_layers.json
%{_libdir}/libnvidia-api.so.1
%{_libdir}/libnvidia-cfg.so.1
@@ -500,7 +501,6 @@ fi ||:
%{_libdir}/libnvoptix.so.1
%{_libdir}/libnvoptix.so.%{version}
%ifarch x86_64
-%{_datadir}/vulkan/icd.d/nvidia_icd.json
%{_datadir}/vulkansc/icd.d/nvidia_icd_vksc.json
%{_libdir}/libnvidia-vksc-core.so.%{version}
%{_libdir}/libnvidia-vksc-core.so.1
3 weeks, 3 days