[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     04a9b5db9d41ad878d5c221c59e902f7490831ac
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 00:07:46 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 00:19:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a9b5db

x11-drivers/nvidia-drivers: add (our own) PREEMPT_RT check for 6.12

Would make it a hard failure (no ~) given a NVIDIA sanity check already
causes the build to fail, but there is a variable to override that.

Doesn't hurt to do our own standard check, mention the variable, and
warn that using it is unsupported given the increasing amount of users
jumping on PREEMPT_RT (that for most they likely do not need nor
understand for who it's useful for, and notably that it will also hurt
performance).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild | 6 ++++++
 x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild | 5 +++++
 x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild       | 5 +++++
 x11-drivers/nvidia-drivers/nvidia-drivers-550.40.79-r1.ebuild  | 5 +++++
 x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild  | 5 +++++
 5 files changed, 26 insertions(+)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild
index fdd7ee295a8d..6d4b7816cd0b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild
@@ -104,6 +104,7 @@ pkg_setup() {
 		~DRM_KMS_HELPER
 		~SYSVIPC
 		~!LOCKDEP
+		~!PREEMPT_RT
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES
 		$(usev powerd '~CPU_FREQ')
@@ -128,6 +129,11 @@ pkg_setup() {
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of another option that requires it such as CONFIG_KVM."
 
+	local ERROR_PREEMPT_RT="CONFIG_PREEMPT_RT: is set but is unsupported by NVIDIA upstream and
+	will fail to build unless the env var IGNORE_PREEMPT_RT_PRESENCE=1 is
+	set. Please do not report issues if run into e.g. kernel panics while
+	ignoring this."
+
 	linux-mod-r1_pkg_setup
 }
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild
index 222d95fdaa81..16b0f7c9bd86 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild
@@ -105,6 +105,7 @@ pkg_setup() {
 		~DRM_KMS_HELPER
 		~SYSVIPC
 		~!LOCKDEP
+		~!PREEMPT_RT
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES
 		$(usev powerd '~CPU_FREQ')
@@ -130,6 +131,10 @@ pkg_setup() {
 	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of another option that requires it such as CONFIG_KVM."
+	local ERROR_PREEMPT_RT="CONFIG_PREEMPT_RT: is set but is unsupported by NVIDIA upstream and
+	will fail to build unless the env var IGNORE_PREEMPT_RT_PRESENCE=1 is
+	set. Please do not report issues if run into e.g. kernel panics while
+	ignoring this."
 
 	linux-mod-r1_pkg_setup
 }

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild
index a9731b9aaa8b..e0b2132a4374 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.135.ebuild
@@ -104,6 +104,7 @@ pkg_setup() {
 		~DRM_KMS_HELPER
 		~SYSVIPC
 		~!LOCKDEP
+		~!PREEMPT_RT
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES
 		$(usev powerd '~CPU_FREQ')
@@ -129,6 +130,10 @@ pkg_setup() {
 	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of another option that requires it such as CONFIG_KVM."
+	local ERROR_PREEMPT_RT="CONFIG_PREEMPT_RT: is set but is unsupported by NVIDIA upstream and
+	will fail to build unless the env var IGNORE_PREEMPT_RT_PRESENCE=1 is
+	set. Please do not report issues if run into e.g. kernel panics while
+	ignoring this."
 
 	linux-mod-r1_pkg_setup
 }

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.79-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.79-r1.ebuild
index 4434d79b1b3d..b89995fb1b0e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.79-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.79-r1.ebuild
@@ -106,6 +106,7 @@ pkg_setup() {
 		~DRM_KMS_HELPER
 		~SYSVIPC
 		~!LOCKDEP
+		~!PREEMPT_RT
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES
 		$(usev powerd '~CPU_FREQ')
@@ -131,6 +132,10 @@ pkg_setup() {
 	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of another option that requires it such as CONFIG_KVM."
+	local ERROR_PREEMPT_RT="CONFIG_PREEMPT_RT: is set but is unsupported by NVIDIA upstream and
+	will fail to build unless the env var IGNORE_PREEMPT_RT_PRESENCE=1 is
+	set. Please do not report issues if run into e.g. kernel panics while
+	ignoring this."
 
 	linux-mod-r1_pkg_setup
 }

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild
index ab706faf496f..14c7ce103198 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r3.ebuild
@@ -109,6 +109,7 @@ pkg_setup() {
 		~DRM_KMS_HELPER
 		~SYSVIPC
 		~!LOCKDEP
+		~!PREEMPT_RT
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES
 		$(usev powerd '~CPU_FREQ')
@@ -134,6 +135,10 @@ pkg_setup() {
 	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of another option that requires it such as CONFIG_KVM."
+	local ERROR_PREEMPT_RT="CONFIG_PREEMPT_RT: is set but is unsupported by NVIDIA upstream and
+	will fail to build unless the env var IGNORE_PREEMPT_RT_PRESENCE=1 is
+	set. Please do not report issues if run into e.g. kernel panics while
+	ignoring this."
 
 	linux-mod-r1_pkg_setup
 }