mirror of
https://github.com/terrapkg/packages.git
synced 2026-05-31 09:01:55 +00:00
fix(nvidia): Various fixes (#11241)
This commit is contained in:
@@ -1,20 +1,16 @@
|
||||
Name: compat-nvidia-repo-580xx
|
||||
Version: 580.142
|
||||
Epoch: 3
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Compatibility package required by official CUDA packages
|
||||
License: NVIDIA License
|
||||
URL: https://developer.nvidia.com/cuda-toolkit
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Requires: nvidia-driver-580xx >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-driver-580xx-cuda >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-driver-580xx-cuda-libs >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-driver-580xx-libs >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-580xx-kmod >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-settings-580xx >= %{?epoch:%{epoch}:}%{version}
|
||||
|
||||
Provides: cuda-drivers-580xx >= %{?epoch:%{epoch}:}%{version}
|
||||
Provides: nvidia-open-580xx >= %{?epoch:%{epoch}:}%{version}
|
||||
# Add any versioned provides:
|
||||
@@ -22,8 +18,9 @@ Provides: cuda-drivers-560 >= %{?epoch:%{epoch}:}%{version}
|
||||
Provides: cuda-drivers-565 >= %{?epoch:%{epoch}:}%{version}
|
||||
Provides: nvidia-open-560 >= %{?epoch:%{epoch}:}%{version}
|
||||
Provides: nvidia-open-565 >= %{?epoch:%{epoch}:}%{version}
|
||||
|
||||
Provides: compat-nvidia-repo-580 = %{evr}
|
||||
BuildArch: noarch
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
Nvidia drivers metapackage required by official CUDA packages. It pulls in all
|
||||
@@ -33,4 +30,5 @@ Nvidia driver components.
|
||||
# Without an empty files section the package is not created.
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:580.142-3
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
%global modulename nvidia-580xx
|
||||
|
||||
Name: dkms-%{modulename}
|
||||
Version: 580.119.02
|
||||
Version: 580.142
|
||||
Release: 1%{?dist}
|
||||
Summary: NVIDIA display driver kernel module
|
||||
Epoch: 3
|
||||
@@ -16,14 +16,16 @@ Source0: https://download.nvidia.com/XFree86/Linux-%{_arch}/%{version}/NV
|
||||
Source1: dkms-nvidia.conf
|
||||
Patch0: 0001-Enable-atomic-kernel-modesetting-by-default.patch
|
||||
BuildRequires: sed
|
||||
Provides: %{modulename}-kmod = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: dkms
|
||||
Conflicts: akmod-nvidia
|
||||
Conflicts: akmod-nvidia-580xx
|
||||
Provides: %{modulename}-kmod = %{?epoch:%{epoch}:}%{version}
|
||||
Provides: nvidia-580-kmod = %{?epoch:%{epoch}:}%{version}
|
||||
Provides: dkms-nvidia-580 = %{evr}
|
||||
Conflicts: akmod-nvidia-580xx
|
||||
Conflicts: nvidia-kmod
|
||||
# Unlike most DKMS packages, this package is NOT noarch!
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
This package provides the proprietary NVIDIA kernel driver modules.
|
||||
@@ -65,4 +67,5 @@ fi
|
||||
%{_usrsrc}/%{modulename}-%{version}
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:580.142-1
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
import "andax/bump_extras.rhai" as bump;
|
||||
|
||||
rpm.version(bump::madoguchi("nvidia-580-kmod-common", labels.branch));
|
||||
rpm.version(bump::madoguchi("nvidia-580xx-kmod-common", labels.branch));
|
||||
|
||||
@@ -12,13 +12,11 @@
|
||||
|
||||
Name: %{real_name}-580xx
|
||||
Version: 580.142
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
|
||||
Epoch: 3
|
||||
License: NVIDIA License
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: %{ix86} x86_64 aarch64
|
||||
|
||||
%dnl Source0: %{name}-%{version}-i386.tar.xz
|
||||
%dnl Source1: %{name}-%{version}-x86_64.tar.xz
|
||||
%dnl Source2: %{name}-%{version}-aarch64.tar.xz
|
||||
@@ -26,12 +24,12 @@ Source8: 70-%{real_name}.preset
|
||||
Source9: 70-%{real_name}-cuda.preset
|
||||
Source10: 10-nvidia.conf
|
||||
Source13: alternate-install-present
|
||||
|
||||
Source40: com.nvidia.driver.metainfo.xml
|
||||
Source41: parse-supported-gpus.py
|
||||
Source42: com.nvidia.driver.png
|
||||
|
||||
Source99: nvidia-generate-tarballs.sh
|
||||
ExclusiveArch: %{ix86} x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%ifarch x86_64 aarch64
|
||||
BuildRequires: libappstream-glib
|
||||
@@ -207,12 +205,10 @@ This package provides the CUDA integration components for %{name}.
|
||||
Summary: X.org X11 NVIDIA driver and extensions
|
||||
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: xorg-x11-server-Xorg%{?_isa}
|
||||
Supplements: (%{real_name}-580xx and xorg-x11-server-Xorg)
|
||||
|
||||
Conflicts: xorg-x11-drv-nvidia
|
||||
Conflicts: xorg-x11-drv-nvidia-470xx
|
||||
|
||||
Provides: xorg-x11-nvidia-580 = %{evr}
|
||||
Supplements: (%{real_name}-580xx and xorg-x11-server-Xorg)
|
||||
|
||||
%description -n xorg-x11-nvidia-580xx
|
||||
The NVIDIA X.org X11 driver and associated components.
|
||||
@@ -548,4 +544,5 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me
|
||||
%{_libdir}/libnvidia-ml.so.%{version}
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:580.142-2
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
project "pkg" {
|
||||
arches = ["x86_64"]
|
||||
rpm {
|
||||
spec = "nvidia-580-kmod-common.spec"
|
||||
}
|
||||
arches = ["x86_64"]
|
||||
labels = {
|
||||
subrepo = "nvidia"
|
||||
weekly = 4
|
||||
updbranch = 1
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,24 +7,19 @@
|
||||
|
||||
Name: %{modulename}-kmod-common
|
||||
Version: 580.142
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Common file for NVIDIA's proprietary driver kernel modules
|
||||
Epoch: 3
|
||||
License: NVIDIA License
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
|
||||
Source17: nvidia-boot-update
|
||||
Source18: nvidia-modeset.conf
|
||||
Source19: nvidia.conf
|
||||
Source20: 60-nvidia.rules
|
||||
Source21: 99-nvidia.conf
|
||||
|
||||
# UDev rule location (_udevrulesdir) and systemd macros:
|
||||
BuildRequires: systemd-rpm-macros
|
||||
|
||||
Requires: dracut
|
||||
Requires: nvidia-modprobe-580xx
|
||||
Requires: nvidia-driver-580xx = %{?epoch:%{epoch}:}%{version}
|
||||
@@ -33,6 +28,8 @@ Requires: %{modulename}-kmod = %{?epoch:%{epoch}:}%{version}
|
||||
Provides: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version}
|
||||
Provides: nvidia-580-kmod-common = %{evr}
|
||||
Obsoletes: cuda-nvidia-kmod-common < %{?epoch:%{epoch}:}%{version}
|
||||
BuildArch: noarch
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
This package provides the common files required by all NVIDIA kernel module
|
||||
@@ -95,4 +92,5 @@ dracut --regenerate-all --force || :
|
||||
%{_udevrulesdir}/60-nvidia.rules
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:580.142-3
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
import "andax/nvidia.rhai" as nvidia;
|
||||
import "andax/bump_extras.rhai" as bump;
|
||||
|
||||
rpm.version(nvidia::nvidia_legacy_version());
|
||||
rpm.version(bump::madoguchi("nvidia-driver-580xx", labels.branch));
|
||||
|
||||
@@ -5,23 +5,23 @@
|
||||
%global debug_package %{nil}
|
||||
|
||||
Name: %{modulename}-kmod
|
||||
Version: 580.119.02
|
||||
Release: 2%{?dist}
|
||||
Version: 580.142
|
||||
Release: 1%{?dist}
|
||||
Summary: NVIDIA display driver kernel module
|
||||
Epoch: 3
|
||||
License: NVIDIA License
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
|
||||
Source0: http://download.nvidia.com/XFree86/Linux-%{_arch}/%{version}/NVIDIA-Linux-%{_arch}-%{version}.run
|
||||
Patch0: 0001-Enable-atomic-kernel-modesetting-by-default.patch
|
||||
BuildRequires: kmodtool
|
||||
Requires: nvidia-580xx-kmod-common = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: akmods
|
||||
Provides: akmod-nvidia-580 = %{evr}
|
||||
|
||||
|
||||
# Get the needed BuildRequires (in parts depending on what we build for):
|
||||
BuildRequires: kmodtool
|
||||
Provides: nvidia-580-kmod = %{?epoch:%{epoch}:}%{version}
|
||||
Conflicts: dkms-nvidia-580xx
|
||||
Conflicts: nvidia-kmod
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
# kmodtool does its magic here:
|
||||
%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
|
||||
@@ -65,4 +65,5 @@ done
|
||||
%{?akmod_install}
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:580.142-1
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
import "andax/bump_extras.rhai" as bump;
|
||||
|
||||
rpm.version(bump::madoguchi("nvidia-580-kmod-common", labels.branch));
|
||||
rpm.version(bump::madoguchi("nvidia-580xx-kmod-common", labels.branch));
|
||||
|
||||
@@ -5,17 +5,15 @@ Version: 580.142
|
||||
Release: 2%{?dist}
|
||||
Summary: NVIDIA kernel module loader
|
||||
Epoch: 3
|
||||
License: GPLv2+
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
|
||||
Source0: https://download.nvidia.com/XFree86/%{real_name}/%{real_name}-%{version}.tar.bz2
|
||||
Patch0: %{real_name}-man-page-permissions.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: m4
|
||||
|
||||
Provides: %{real_name}-580 = %{evr}
|
||||
Provides: %{real_name}-580 = %{evr}
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
This utility is used by user-space NVIDIA driver components to make sure the
|
||||
@@ -48,4 +46,5 @@ make %{?_smp_mflags} \
|
||||
%{_mandir}/man1/%{real_name}.1.*
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:580.142-2
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,29 +1,26 @@
|
||||
%global real_name nvidia-persistenced
|
||||
|
||||
Name: %{real_name}-580xx
|
||||
Version: 580.142
|
||||
Release: 2%{?dist}
|
||||
Summary: A daemon to maintain persistent software state in the NVIDIA driver
|
||||
Epoch: 3
|
||||
License: GPLv2+
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
|
||||
Source0: https://download.nvidia.com/XFree86/%{real_name}/%{real_name}-%{version}.tar.bz2
|
||||
Source1: %{real_name}.service
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libtirpc-devel
|
||||
BuildRequires: m4
|
||||
|
||||
Name: %{real_name}-580xx
|
||||
Version: 580.142
|
||||
Release: 3%{?dist}
|
||||
Summary: A daemon to maintain persistent software state in the NVIDIA driver
|
||||
Epoch: 3
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Source0: https://download.nvidia.com/XFree86/%{real_name}/%{real_name}-%{version}.tar.bz2
|
||||
Source1: %{real_name}.service
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libtirpc-devel
|
||||
BuildRequires: m4
|
||||
# For Fedora systemd-rpm-macros would be enough:
|
||||
BuildRequires: systemd-devel
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
Requires: libnvidia-cfg-580xx%{?_isa} >= %{?epoch:%{epoch}:}%{version}
|
||||
|
||||
Provides: %{real_name}-580 = %{evr}
|
||||
BuildRequires: systemd-devel
|
||||
Requires: libnvidia-cfg-580xx%{?_isa} >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
Provides: %{real_name}-580 = %{evr}
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
The %{real_name} utility is used to enable persistent software state in the NVIDIA
|
||||
@@ -80,4 +77,5 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{real_name}.service
|
||||
%{_sharedstatedir}/%{real_name}
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:580.142-3
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -2,13 +2,11 @@
|
||||
|
||||
Name: %{real_name}-580xx
|
||||
Version: 580.142
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Configure the NVIDIA graphics driver
|
||||
Epoch: 3
|
||||
License: GPLv2+
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
|
||||
Source0: https://download.nvidia.com/XFree86/%{real_name}/%{real_name}-%{version}.tar.bz2
|
||||
Source1: %{real_name}-load.desktop
|
||||
Source2: %{real_name}.appdata.xml
|
||||
@@ -17,7 +15,6 @@ Patch1: %{real_name}-lib-permissions.patch
|
||||
Patch2: %{real_name}-link-order.patch
|
||||
Patch3: %{real_name}-libXNVCtrl.patch
|
||||
Patch4: %{real_name}-ld-dep-remove.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: gcc
|
||||
@@ -34,13 +31,13 @@ BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(wayland-client)
|
||||
BuildRequires: vulkan-headers
|
||||
|
||||
Requires: nvidia-libXNVCtrl-580xx%{?_isa} = %{?epoch}:%{version}-%{release}
|
||||
Requires: nvidia-driver-580xx%{?_isa} = %{?epoch}:%{version}
|
||||
# Loaded at runtime
|
||||
Requires: libvdpau%{?_isa} >= 0.9
|
||||
|
||||
Provides: %{real_name}-580 = %{evr}
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
The %{real_name} utility is a tool for configuring the NVIDIA graphics
|
||||
@@ -141,4 +138,5 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{real_name}.
|
||||
%{_libdir}/libXNVCtrl.so
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:580.142-3
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -2,23 +2,20 @@
|
||||
|
||||
Name: %{real_name}-580xx
|
||||
Version: 580.142
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: NVIDIA X configuration file editor
|
||||
Epoch: 3
|
||||
License: GPLv2+
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
|
||||
Source0: https://download.nvidia.com/XFree86/%{real_name}/%{real_name}-%{version}.tar.bz2
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libpciaccess-devel
|
||||
BuildRequires: m4
|
||||
|
||||
Requires: libnvidia-cfg-580xx%{?_isa} >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: xorg-x11-nvidia-580xx%{?_isa} >= %{?epoch:%{epoch}:}%{version}
|
||||
|
||||
Provides: %{real_name}-580 = %{evr}
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
%{real_name} is a command line tool intended to provide basic control over
|
||||
@@ -52,4 +49,5 @@ make %{?_smp_mflags} \
|
||||
%{_mandir}/man1/%{real_name}.1*
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:580.142-3
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,20 +1,16 @@
|
||||
Name: compat-nvidia-repo
|
||||
Version: 595.58.03
|
||||
Epoch: 3
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Compatibility package required by official CUDA packages
|
||||
License: NVIDIA License
|
||||
URL: https://developer.nvidia.com/cuda-toolkit
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Requires: nvidia-driver >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-driver-cuda >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-driver-cuda-libs >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-driver-libs >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-kmod >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-settings >= %{?epoch:%{epoch}:}%{version}
|
||||
|
||||
Provides: cuda-drivers >= %{?epoch:%{epoch}:}%{version}
|
||||
Provides: nvidia-open >= %{?epoch:%{epoch}:}%{version}
|
||||
# Add any versioned provides:
|
||||
@@ -22,6 +18,8 @@ Provides: cuda-drivers-560 >= %{?epoch:%{epoch}:}%{version}
|
||||
Provides: cuda-drivers-565 >= %{?epoch:%{epoch}:}%{version}
|
||||
Provides: nvidia-open-560 >= %{?epoch:%{epoch}:}%{version}
|
||||
Provides: nvidia-open-565 >= %{?epoch:%{epoch}:}%{version}
|
||||
BuildArch: noarch
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
Nvidia drivers metapackage required by official CUDA packages. It pulls in all
|
||||
@@ -31,4 +29,5 @@ Nvidia driver components.
|
||||
# Without an empty files section the package is not created.
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:595.58.03-2
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
From 60d1ddc17835226ec67ed1bc1c28524e3bb6e151 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jung <admin@ptr1337.dev>
|
||||
Date: Sun, 20 Apr 2025 18:13:22 +0200
|
||||
Subject: [PATCH 1/8] Enable atomic kernel modesetting by default
|
||||
|
||||
This is required for proper functionality under Wayland. fbdev has been default enabled since 570 so that
|
||||
hunk can be removed from this patch.
|
||||
|
||||
Signed-off-by: Peter Jung <admin@ptr1337.dev>
|
||||
---
|
||||
kernel-open/nvidia-drm/nvidia-drm-linux.c | 2 +-
|
||||
kernel-open/nvidia-drm/nvidia-drm-os-interface.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git an/kernel-open/nvidia-drm/nvidia-drm-linux.c b/kernel-open/nvidia-drm/nvidia-drm-linux.c
|
||||
index 3cb1815d..209cb469 100644
|
||||
--- a/kernel-open/nvidia-drm/nvidia-drm-linux.c
|
||||
+++ b/kernel-open/nvidia-drm/nvidia-drm-linux.c
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
MODULE_PARM_DESC(
|
||||
modeset,
|
||||
- "Enable atomic kernel modesetting (1 = enable, 0 = disable (default))");
|
||||
+ "Enable atomic kernel modesetting (1 = enable (default), 0 = disable)");
|
||||
module_param_named(modeset, nv_drm_modeset_module_param, bool, 0400);
|
||||
|
||||
#if defined(NV_DRM_FBDEV_AVAILABLE)
|
||||
diff --git a/kernel-open/nvidia-drm/nvidia-drm-os-interface.c b/kernel-open/nvidia-drm/nvidia-drm-os-interface.c
|
||||
index 7617476d..f22afd77 100644
|
||||
--- a/kernel-open/nvidia-drm/nvidia-drm-os-interface.c
|
||||
+++ b/kernel-open/nvidia-drm/nvidia-drm-os-interface.c
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <drm/drmP.h>
|
||||
#endif
|
||||
|
||||
-bool nv_drm_modeset_module_param = false;
|
||||
+bool nv_drm_modeset_module_param = true;
|
||||
bool nv_drm_fbdev_module_param = true;
|
||||
|
||||
void *nv_drm_calloc(size_t nmemb, size_t size)
|
||||
--
|
||||
2.49.0.391.g4bbb303af6
|
||||
|
||||
|
||||
@@ -1,130 +0,0 @@
|
||||
From c9457ce40a6af2ce74c520564e2d8775f49e3d27 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Naim <dnaim@cachyos.org>
|
||||
Date: Thu, 18 Dec 2025 12:36:06 +0800
|
||||
Subject: [PATCH 3/3] Fix compile for 6.19
|
||||
|
||||
Contains:
|
||||
- Rename page_free callback -> folio_free callback for 6.19+
|
||||
- Adjust zone_device_page_init() call for 6.19; it has one extra argument now
|
||||
- 6.19-rc8 introduced yet another argument for zone_device_page_init()
|
||||
|
||||
Link: https://github.com/torvalds/linux/commit/12b2285bf3d14372238d36215b73af02ac3bdfc1
|
||||
Signed-off-by: Eric Naim <dnaim@cachyos.org>
|
||||
---
|
||||
kernel-open/nvidia-uvm/uvm_hmm.c | 4 ++++
|
||||
kernel-open/nvidia-uvm/uvm_pmm_gpu.c | 34 ++++++++++++++++++++++++++++
|
||||
2 files changed, 38 insertions(+)
|
||||
|
||||
diff --git a/kernel-open/nvidia-uvm/uvm_hmm.c b/kernel-open/nvidia-uvm/uvm_hmm.c
|
||||
index 9b676f971385..22db001384a4 100644
|
||||
--- a/kernel-open/nvidia-uvm/uvm_hmm.c
|
||||
+++ b/kernel-open/nvidia-uvm/uvm_hmm.c
|
||||
@@ -2140,7 +2140,11 @@ static void fill_dst_pfn(uvm_va_block_t *va_block,
|
||||
|
||||
UVM_ASSERT(!page_count(dpage));
|
||||
UVM_ASSERT(!dpage->zone_device_data);
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+ zone_device_page_init(dpage, page_pgmap(dpage), 0);
|
||||
+#else
|
||||
zone_device_page_init(dpage);
|
||||
+#endif
|
||||
dpage->zone_device_data = gpu_chunk;
|
||||
atomic64_inc(&va_block->hmm.va_space->hmm.allocated_page_count);
|
||||
}
|
||||
diff --git a/kernel-open/nvidia-uvm/uvm_pmm_gpu.c b/kernel-open/nvidia-uvm/uvm_pmm_gpu.c
|
||||
index 97ff13dcdd04..98423002776b 100644
|
||||
--- a/kernel-open/nvidia-uvm/uvm_pmm_gpu.c
|
||||
+++ b/kernel-open/nvidia-uvm/uvm_pmm_gpu.c
|
||||
@@ -177,6 +177,8 @@
|
||||
#include "uvm_test.h"
|
||||
#include "uvm_linux.h"
|
||||
|
||||
+#include <linux/version.h>
|
||||
+
|
||||
#if defined(CONFIG_PCI_P2PDMA) && defined(NV_STRUCT_PAGE_HAS_ZONE_DEVICE_DATA)
|
||||
#include <linux/pci-p2pdma.h>
|
||||
#endif
|
||||
@@ -2999,8 +3001,14 @@ static bool uvm_pmm_gpu_check_orphan_pages(uvm_pmm_gpu_t *pmm)
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+static void devmem_folio_free(struct folio *folio)
|
||||
+{
|
||||
+ struct page *page = &folio->page;
|
||||
+#else
|
||||
static void devmem_page_free(struct page *page)
|
||||
{
|
||||
+#endif
|
||||
uvm_gpu_chunk_t *chunk = uvm_pmm_devmem_page_to_chunk(page);
|
||||
uvm_gpu_t *gpu = uvm_gpu_chunk_get_gpu(chunk);
|
||||
|
||||
@@ -3060,7 +3068,11 @@ static vm_fault_t devmem_fault_entry(struct vm_fault *vmf)
|
||||
|
||||
static const struct dev_pagemap_ops uvm_pmm_devmem_ops =
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+ .folio_free = devmem_folio_free,
|
||||
+#else
|
||||
.page_free = devmem_page_free,
|
||||
+#endif
|
||||
.migrate_to_ram = devmem_fault_entry,
|
||||
};
|
||||
|
||||
@@ -3148,8 +3160,14 @@ static void device_p2p_page_free_wake(struct nv_kref *ref)
|
||||
wake_up(&p2p_mem->waitq);
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+static void device_p2p_folio_free(struct folio *folio)
|
||||
+{
|
||||
+ struct page *page = &folio->page;
|
||||
+#else
|
||||
static void device_p2p_page_free(struct page *page)
|
||||
{
|
||||
+#endif
|
||||
uvm_device_p2p_mem_t *p2p_mem = page->zone_device_data;
|
||||
|
||||
page->zone_device_data = NULL;
|
||||
@@ -3158,14 +3176,26 @@ static void device_p2p_page_free(struct page *page)
|
||||
#endif
|
||||
|
||||
#if UVM_CDMM_PAGES_SUPPORTED()
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+static void device_coherent_folio_free(struct folio *folio)
|
||||
+{
|
||||
+ device_p2p_folio_free(folio);
|
||||
+}
|
||||
+#else
|
||||
static void device_coherent_page_free(struct page *page)
|
||||
{
|
||||
device_p2p_page_free(page);
|
||||
}
|
||||
+#endif
|
||||
|
||||
static const struct dev_pagemap_ops uvm_device_coherent_pgmap_ops =
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+ .folio_free = device_coherent_folio_free,
|
||||
+#else
|
||||
.page_free = device_coherent_page_free,
|
||||
+#endif
|
||||
};
|
||||
|
||||
static NV_STATUS uvm_pmm_cdmm_init(uvm_parent_gpu_t *parent_gpu)
|
||||
@@ -3302,7 +3332,11 @@ static bool uvm_pmm_gpu_check_orphan_pages(uvm_pmm_gpu_t *pmm)
|
||||
|
||||
static const struct dev_pagemap_ops uvm_device_p2p_pgmap_ops =
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+ .folio_free = device_p2p_folio_free,
|
||||
+#else
|
||||
.page_free = device_p2p_page_free,
|
||||
+#endif
|
||||
};
|
||||
|
||||
void uvm_pmm_gpu_device_p2p_init(uvm_parent_gpu_t *parent_gpu)
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -5,25 +5,26 @@
|
||||
|
||||
Name: dkms-%{modulename}
|
||||
Version: 595.58.03
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: NVIDIA display driver kernel module
|
||||
Epoch: 3
|
||||
License: NVIDIA License
|
||||
URL: https://www.nvidia.com/object/unix.html
|
||||
Source0: https://github.com/NVIDIA/open-gpu-kernel-modules/archive/%{version}/open-gpu-kernel-modules-%{version}.tar.gz
|
||||
Source1: %{name}.conf
|
||||
Patch0: 0001-Enable-atomic-kernel-modesetting-by-default.patch
|
||||
Patch1: 6.19-590.patch
|
||||
Patch0: https://github.com/CachyOS/open-gpu-kernel-modules/commit/211f012865b8ea2ba62c3422f5519cb32395c3e0.patch
|
||||
Patch1: https://github.com/CachyOS/open-gpu-kernel-modules/commit/92789a5709f64008bee34bb044e33a3de9702eb7.patch
|
||||
BuildRequires: sed
|
||||
Provides: %{modulename}-kmod = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: dkms
|
||||
Requires: gcc-c++
|
||||
Conflicts: akmod-nvidia
|
||||
# Unlike most DKMS packages, this package is NOT noarch!
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Provides: %{modulename}-kmod = %{?epoch:%{epoch}:}%{version}
|
||||
Provides: %{name}-open = %{?epoch:%{epoch}:}%{version}
|
||||
Obsoletes: %{name}-open < %{?epoch:%{epoch}:}%{version}
|
||||
Conflicts: akmod-%{modulename}
|
||||
Conflicts: %{modulename}-kmod-580xx
|
||||
# Unlike most DKMS packages, this package is NOT noarch!
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
This package provides the NVIDIA kernel driver modules.
|
||||
@@ -57,4 +58,6 @@ dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || :
|
||||
%{_usrsrc}/%{modulename}-%{version}
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:595.58.03-2
|
||||
- Update patches for DSC functionality
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -10,23 +10,19 @@
|
||||
|
||||
Name: nvidia-driver
|
||||
Version: 595.58.03
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
|
||||
Epoch: 3
|
||||
License: NVIDIA License
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: %{ix86} x86_64 aarch64
|
||||
Source8: 70-nvidia-driver.preset
|
||||
Source9: 70-nvidia-driver-cuda.preset
|
||||
Source10: 10-nvidia.conf
|
||||
Source13: alternate-install-present
|
||||
|
||||
Source40: com.nvidia.driver.metainfo.xml
|
||||
Source41: parse-supported-gpus.py
|
||||
Source42: com.nvidia.driver.png
|
||||
|
||||
Source99: nvidia-generate-tarballs.sh
|
||||
|
||||
%ifarch x86_64 aarch64
|
||||
BuildRequires: libappstream-glib
|
||||
%if 0%{?rhel} == 8
|
||||
@@ -39,14 +35,14 @@ BuildRequires: systemd-rpm-macros
|
||||
%endif
|
||||
BuildRequires: wget
|
||||
BuildRequires: coreutils
|
||||
|
||||
Requires: nvidia-driver-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-kmod-common = %{?epoch:%{epoch}:}%{version}
|
||||
|
||||
Conflicts: nvidia-x11-drv
|
||||
Conflicts: nvidia-x11-drv-470xx
|
||||
Conflicts: xorg-x11-drv-nvidia
|
||||
Conflicts: xorg-x11-drv-nvidia-470xx
|
||||
ExclusiveArch: %{ix86} x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
This package provides the most recent NVIDIA display driver which allows for
|
||||
@@ -77,7 +73,6 @@ Requires: vulkan-loader
|
||||
Requires: libnvidia-gpucomp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: libnvidia-ml%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: %{name}-cuda-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
|
||||
Conflicts: nvidia-x11-drv-libs
|
||||
Conflicts: nvidia-x11-drv-470xx-libs
|
||||
Conflicts: xorg-x11-drv-nvidia-libs
|
||||
@@ -91,7 +86,6 @@ Summary: Libraries for %{name}-cuda
|
||||
Requires: %{name}-cuda-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
|
||||
# dlopened:
|
||||
%ifarch x86_64 aarch64
|
||||
Requires: libnvidia-cfg = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
@@ -103,7 +97,6 @@ Requires: libnvidia-ml = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: (%{name}-cuda-libs(x86-32) = %{?epoch:%{epoch}:}%{version}-%{release} if steam(x86-32))
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Conflicts: xorg-x11-drv-nvidia-cuda-libs
|
||||
Conflicts: xorg-x11-drv-nvidia-470xx-cuda-libs
|
||||
|
||||
@@ -171,7 +164,6 @@ Requires: nvidia-kmod-common = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: nvidia-persistenced = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: (ocl-icd or OpenCL-ICD-Loader)
|
||||
Requires: opencl-filesystem
|
||||
|
||||
Conflicts: xorg-x11-drv-nvidia-cuda
|
||||
Conflicts: xorg-x11-drv-nvidia-470xx-cuda
|
||||
|
||||
@@ -184,7 +176,6 @@ Summary: X.org X11 NVIDIA driver and extensions
|
||||
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: xorg-x11-server-Xorg%{?_isa}
|
||||
Supplements: (nvidia-driver and xorg-x11-server-Xorg)
|
||||
|
||||
Conflicts: xorg-x11-drv-nvidia
|
||||
Conflicts: xorg-x11-drv-nvidia-470xx
|
||||
|
||||
@@ -514,4 +505,5 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me
|
||||
%{_libdir}/libnvidia-ml.so.%{version}
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:595.58.03-2
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
project "pkg" {
|
||||
arches = ["x86_64"]
|
||||
rpm {
|
||||
spec = "nvidia-kmod-common.spec"
|
||||
}
|
||||
arches = ["x86_64"]
|
||||
labels = {
|
||||
subrepo = "nvidia"
|
||||
weekly = 3
|
||||
updbranch = 1
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,24 +6,19 @@
|
||||
|
||||
Name: nvidia-kmod-common
|
||||
Version: 595.58.03
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Common file for NVIDIA's proprietary driver kernel modules
|
||||
Epoch: 3
|
||||
License: NVIDIA License
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
|
||||
Source17: nvidia-boot-update
|
||||
Source19: nvidia-modeset.conf
|
||||
Source20: nvidia.conf
|
||||
Source21: 60-nvidia.rules
|
||||
Source24: 99-nvidia.conf
|
||||
|
||||
# UDev rule location (_udevrulesdir) and systemd macros:
|
||||
BuildRequires: systemd-rpm-macros
|
||||
|
||||
Requires: dracut
|
||||
Requires: nvidia-modprobe
|
||||
Requires: nvidia-driver = %{?epoch:%{epoch}:}%{version}
|
||||
@@ -33,6 +28,8 @@ Requires: gcc-c++
|
||||
Provides: nvidia-kmod-common = %{?epoch:%{epoch}:}%{version}
|
||||
Obsoletes: nvidia-open-kmod-common < %{?epoch:%{epoch}:}%{version}
|
||||
Obsoletes: cuda-nvidia-kmod-common < %{?epoch:%{epoch}:}%{version}
|
||||
BuildArch: noarch
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
This package provides the common files required by all NVIDIA kernel module
|
||||
@@ -88,4 +85,5 @@ fi ||:
|
||||
%{_udevrulesdir}/60-nvidia.rules
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:595.58.03-2
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
import "andax/nvidia.rhai" as nvidia;
|
||||
import "andax/bump_extras.rhai" as bump;
|
||||
|
||||
rpm.version(nvidia::nvidia_driver_version());
|
||||
rpm.version(bump::madoguchi("nvidia-driver", labels.branch));
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
From 60d1ddc17835226ec67ed1bc1c28524e3bb6e151 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jung <admin@ptr1337.dev>
|
||||
Date: Sun, 20 Apr 2025 18:13:22 +0200
|
||||
Subject: [PATCH 1/8] Enable atomic kernel modesetting by default
|
||||
|
||||
This is required for proper functionality under Wayland. fbdev has been default enabled since 570 so that
|
||||
hunk can be removed from this patch.
|
||||
|
||||
Signed-off-by: Peter Jung <admin@ptr1337.dev>
|
||||
---
|
||||
kernel-open/nvidia-drm/nvidia-drm-linux.c | 2 +-
|
||||
kernel-open/nvidia-drm/nvidia-drm-os-interface.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git an/kernel-open/nvidia-drm/nvidia-drm-linux.c b/kernel-open/nvidia-drm/nvidia-drm-linux.c
|
||||
index 3cb1815d..209cb469 100644
|
||||
--- a/kernel-open/nvidia-drm/nvidia-drm-linux.c
|
||||
+++ b/kernel-open/nvidia-drm/nvidia-drm-linux.c
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
MODULE_PARM_DESC(
|
||||
modeset,
|
||||
- "Enable atomic kernel modesetting (1 = enable, 0 = disable (default))");
|
||||
+ "Enable atomic kernel modesetting (1 = enable (default), 0 = disable)");
|
||||
module_param_named(modeset, nv_drm_modeset_module_param, bool, 0400);
|
||||
|
||||
#if defined(NV_DRM_FBDEV_AVAILABLE)
|
||||
diff --git a/kernel-open/nvidia-drm/nvidia-drm-os-interface.c b/kernel-open/nvidia-drm/nvidia-drm-os-interface.c
|
||||
index 7617476d..f22afd77 100644
|
||||
--- a/kernel-open/nvidia-drm/nvidia-drm-os-interface.c
|
||||
+++ b/kernel-open/nvidia-drm/nvidia-drm-os-interface.c
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <drm/drmP.h>
|
||||
#endif
|
||||
|
||||
-bool nv_drm_modeset_module_param = false;
|
||||
+bool nv_drm_modeset_module_param = true;
|
||||
bool nv_drm_fbdev_module_param = true;
|
||||
|
||||
void *nv_drm_calloc(size_t nmemb, size_t size)
|
||||
--
|
||||
2.49.0.391.g4bbb303af6
|
||||
|
||||
|
||||
@@ -1,130 +0,0 @@
|
||||
From c9457ce40a6af2ce74c520564e2d8775f49e3d27 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Naim <dnaim@cachyos.org>
|
||||
Date: Thu, 18 Dec 2025 12:36:06 +0800
|
||||
Subject: [PATCH 3/3] Fix compile for 6.19
|
||||
|
||||
Contains:
|
||||
- Rename page_free callback -> folio_free callback for 6.19+
|
||||
- Adjust zone_device_page_init() call for 6.19; it has one extra argument now
|
||||
- 6.19-rc8 introduced yet another argument for zone_device_page_init()
|
||||
|
||||
Link: https://github.com/torvalds/linux/commit/12b2285bf3d14372238d36215b73af02ac3bdfc1
|
||||
Signed-off-by: Eric Naim <dnaim@cachyos.org>
|
||||
---
|
||||
kernel-open/nvidia-uvm/uvm_hmm.c | 4 ++++
|
||||
kernel-open/nvidia-uvm/uvm_pmm_gpu.c | 34 ++++++++++++++++++++++++++++
|
||||
2 files changed, 38 insertions(+)
|
||||
|
||||
diff --git a/kernel-open/nvidia-uvm/uvm_hmm.c b/kernel-open/nvidia-uvm/uvm_hmm.c
|
||||
index 9b676f971385..22db001384a4 100644
|
||||
--- a/kernel-open/nvidia-uvm/uvm_hmm.c
|
||||
+++ b/kernel-open/nvidia-uvm/uvm_hmm.c
|
||||
@@ -2140,7 +2140,11 @@ static void fill_dst_pfn(uvm_va_block_t *va_block,
|
||||
|
||||
UVM_ASSERT(!page_count(dpage));
|
||||
UVM_ASSERT(!dpage->zone_device_data);
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+ zone_device_page_init(dpage, page_pgmap(dpage), 0);
|
||||
+#else
|
||||
zone_device_page_init(dpage);
|
||||
+#endif
|
||||
dpage->zone_device_data = gpu_chunk;
|
||||
atomic64_inc(&va_block->hmm.va_space->hmm.allocated_page_count);
|
||||
}
|
||||
diff --git a/kernel-open/nvidia-uvm/uvm_pmm_gpu.c b/kernel-open/nvidia-uvm/uvm_pmm_gpu.c
|
||||
index 97ff13dcdd04..98423002776b 100644
|
||||
--- a/kernel-open/nvidia-uvm/uvm_pmm_gpu.c
|
||||
+++ b/kernel-open/nvidia-uvm/uvm_pmm_gpu.c
|
||||
@@ -177,6 +177,8 @@
|
||||
#include "uvm_test.h"
|
||||
#include "uvm_linux.h"
|
||||
|
||||
+#include <linux/version.h>
|
||||
+
|
||||
#if defined(CONFIG_PCI_P2PDMA) && defined(NV_STRUCT_PAGE_HAS_ZONE_DEVICE_DATA)
|
||||
#include <linux/pci-p2pdma.h>
|
||||
#endif
|
||||
@@ -2999,8 +3001,14 @@ static bool uvm_pmm_gpu_check_orphan_pages(uvm_pmm_gpu_t *pmm)
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+static void devmem_folio_free(struct folio *folio)
|
||||
+{
|
||||
+ struct page *page = &folio->page;
|
||||
+#else
|
||||
static void devmem_page_free(struct page *page)
|
||||
{
|
||||
+#endif
|
||||
uvm_gpu_chunk_t *chunk = uvm_pmm_devmem_page_to_chunk(page);
|
||||
uvm_gpu_t *gpu = uvm_gpu_chunk_get_gpu(chunk);
|
||||
|
||||
@@ -3060,7 +3068,11 @@ static vm_fault_t devmem_fault_entry(struct vm_fault *vmf)
|
||||
|
||||
static const struct dev_pagemap_ops uvm_pmm_devmem_ops =
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+ .folio_free = devmem_folio_free,
|
||||
+#else
|
||||
.page_free = devmem_page_free,
|
||||
+#endif
|
||||
.migrate_to_ram = devmem_fault_entry,
|
||||
};
|
||||
|
||||
@@ -3148,8 +3160,14 @@ static void device_p2p_page_free_wake(struct nv_kref *ref)
|
||||
wake_up(&p2p_mem->waitq);
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+static void device_p2p_folio_free(struct folio *folio)
|
||||
+{
|
||||
+ struct page *page = &folio->page;
|
||||
+#else
|
||||
static void device_p2p_page_free(struct page *page)
|
||||
{
|
||||
+#endif
|
||||
uvm_device_p2p_mem_t *p2p_mem = page->zone_device_data;
|
||||
|
||||
page->zone_device_data = NULL;
|
||||
@@ -3158,14 +3176,26 @@ static void device_p2p_page_free(struct page *page)
|
||||
#endif
|
||||
|
||||
#if UVM_CDMM_PAGES_SUPPORTED()
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+static void device_coherent_folio_free(struct folio *folio)
|
||||
+{
|
||||
+ device_p2p_folio_free(folio);
|
||||
+}
|
||||
+#else
|
||||
static void device_coherent_page_free(struct page *page)
|
||||
{
|
||||
device_p2p_page_free(page);
|
||||
}
|
||||
+#endif
|
||||
|
||||
static const struct dev_pagemap_ops uvm_device_coherent_pgmap_ops =
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+ .folio_free = device_coherent_folio_free,
|
||||
+#else
|
||||
.page_free = device_coherent_page_free,
|
||||
+#endif
|
||||
};
|
||||
|
||||
static NV_STATUS uvm_pmm_cdmm_init(uvm_parent_gpu_t *parent_gpu)
|
||||
@@ -3302,7 +3332,11 @@ static bool uvm_pmm_gpu_check_orphan_pages(uvm_pmm_gpu_t *pmm)
|
||||
|
||||
static const struct dev_pagemap_ops uvm_device_p2p_pgmap_ops =
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
|
||||
+ .folio_free = device_p2p_folio_free,
|
||||
+#else
|
||||
.page_free = device_p2p_page_free,
|
||||
+#endif
|
||||
};
|
||||
|
||||
void uvm_pmm_gpu_device_p2p_init(uvm_parent_gpu_t *parent_gpu)
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -8,24 +8,24 @@
|
||||
|
||||
Name: nvidia-kmod
|
||||
Version: 595.58.03
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: NVIDIA display driver kernel module
|
||||
Epoch: 3
|
||||
License: NVIDIA License
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
|
||||
Source0: https://github.com/NVIDIA/open-gpu-kernel-modules/archive/%{version}/open-gpu-kernel-modules-%{version}.tar.gz
|
||||
Patch0: 0001-Enable-atomic-kernel-modesetting-by-default.patch
|
||||
Patch1: 6.19-590.patch
|
||||
Patch0: https://github.com/CachyOS/open-gpu-kernel-modules/commit/211f012865b8ea2ba62c3422f5519cb32395c3e0.patch
|
||||
Patch1: https://github.com/CachyOS/open-gpu-kernel-modules/commit/92789a5709f64008bee34bb044e33a3de9702eb7.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: kmodtool
|
||||
Requires: nvidia-kmod-common = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: akmods
|
||||
Provides: akmod-nvidia-open = %{?epoch:%{epoch}:}%{version}
|
||||
Obsoletes: akmod-nvidia-open < %{?epoch:%{epoch}:}%{version}
|
||||
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: kmodtool
|
||||
Conflicts: dkms-nvidia
|
||||
Conflicts: nvidia-kmod-580xx
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
# kmodtool does its magic here:
|
||||
%{expand:%(kmodtool --target %{_target_cpu} --repo terrapkg.com --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
|
||||
@@ -67,4 +67,6 @@ done
|
||||
%{?akmod_install}
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:595.58.03-3
|
||||
- Update patches for DSC functionality
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
Name: nvidia-modprobe
|
||||
Version: 595.58.03
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: NVIDIA kernel module loader
|
||||
Epoch: 3
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
|
||||
Source0: https://download.nvidia.com/XFree86/%{name}/%{name}-%{version}.tar.bz2
|
||||
Patch0: %{name}-man-page-permissions.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: m4
|
||||
BuildRequires: sed
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
This utility is used by user-space NVIDIA driver components to make sure the
|
||||
@@ -45,4 +44,5 @@ make %{?_smp_mflags} \
|
||||
%{_mandir}/man1/%{name}.1.*
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:595.58.03-2
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,26 +1,24 @@
|
||||
Name: nvidia-persistenced
|
||||
Version: 595.58.03
|
||||
Release: 1%{?dist}
|
||||
Summary: A daemon to maintain persistent software state in the NVIDIA driver
|
||||
Epoch: 3
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
|
||||
Source0: https://download.nvidia.com/XFree86/%{name}/%{name}-%{version}.tar.bz2
|
||||
Source1: %{name}.service
|
||||
Source2: %{name}-sysusers.conf
|
||||
|
||||
Name: nvidia-persistenced
|
||||
Version: 595.58.03
|
||||
Release: 2%{?dist}
|
||||
Summary: A daemon to maintain persistent software state in the NVIDIA driver
|
||||
Epoch: 3
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
Source0: https://download.nvidia.com/XFree86/%{name}/%{name}-%{version}.tar.bz2
|
||||
Source1: %{name}.service
|
||||
Source2: %{name}-sysusers.conf
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libtirpc-devel
|
||||
BuildRequires: m4
|
||||
BuildRequires: sed
|
||||
BuildRequires: systemd-rpm-macros
|
||||
|
||||
Requires: libnvidia-cfg%{?_isa} >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
Requires: libnvidia-cfg%{?_isa} >= %{?epoch:%{epoch}:}%{version}
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
The %{name} utility is used to enable persistent software state in the NVIDIA
|
||||
@@ -71,4 +69,5 @@ install -Dpm644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
|
||||
%{_sysusersdir}/%{name}.conf
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:595.58.03-2
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
Name: nvidia-settings
|
||||
Version: 595.58.03
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Configure the NVIDIA graphics driver
|
||||
Epoch: 3
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
|
||||
Source0: https://download.nvidia.com/XFree86/%{name}/%{name}-%{version}.tar.bz2
|
||||
Source1: %{name}-load.desktop
|
||||
Source2: %{name}.appdata.xml
|
||||
@@ -15,7 +13,6 @@ Patch1: %{name}-lib-permissions.patch
|
||||
Patch2: %{name}-link-order.patch
|
||||
Patch3: %{name}-libXNVCtrl.patch
|
||||
Patch4: %{name}-ld-dep-remove.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: gcc
|
||||
@@ -33,11 +30,12 @@ BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(wayland-client)
|
||||
BuildRequires: sed
|
||||
BuildRequires: vulkan-headers
|
||||
|
||||
Requires: nvidia-libXNVCtrl%{?_isa} = %{?epoch}:%{version}-%{release}
|
||||
Requires: nvidia-driver%{?_isa} = %{?epoch}:%{version}
|
||||
# Loaded at runtime
|
||||
Requires: libvdpau%{?_isa} >= 0.9
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
The %{name} utility is a tool for configuring the NVIDIA graphics
|
||||
@@ -131,4 +129,5 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.appda
|
||||
%{_libdir}/libXNVCtrl.so
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:595.58.03-2
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
@@ -1,21 +1,19 @@
|
||||
Name: nvidia-xconfig
|
||||
Version: 595.58.03
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: NVIDIA X configuration file editor
|
||||
Epoch: 3
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://www.nvidia.com/object/unix.html
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
|
||||
Source0: https://download.nvidia.com/XFree86/%{name}/%{name}-%{version}.tar.bz2
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libpciaccess-devel
|
||||
BuildRequires: m4
|
||||
BuildRequires: sed
|
||||
|
||||
Requires: libnvidia-cfg%{?_isa} >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires: xorg-x11-nvidia%{?_isa} >= %{?epoch:%{epoch}:}%{version}
|
||||
ExclusiveArch: x86_64 aarch64
|
||||
Packager: Terra Packaging Team <terra@fyralabs.com>
|
||||
|
||||
%description
|
||||
%{name} is a command line tool intended to provide basic control over
|
||||
@@ -49,4 +47,5 @@ make %{?_smp_mflags} \
|
||||
%{_mandir}/man1/%{name}.1*
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Apr 13 2026 Gilver E. <roachy@fyralabs.com> - 3:595.58.03-2
|
||||
- Update spec for Terra packaging team
|
||||
|
||||
Reference in New Issue
Block a user