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

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

commit:     25e0e3ac7ab9febd7ead4bec0e79e6cd7003f38c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 24 03:08:29 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 03:27:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e0e3ac

x11-drivers/nvidia-drivers: suggest disabling CONFIG_DRM_SIMPLEDRM

Mostly as a precaution, being set may not always be an issue.

New in kernel 5.14 and may conflict with nvidia's mode switching
if used with fbdev emulation. Previously benign but fixes have
caused to become active between kernel 5.14.9 and 5.14.14.

Will hopefully revisit this in the future given this is meant to
replace efifb/simplefb at some point. Will notably keep an eye on
what gentoo-kernel-bin's config upstream does, currently kept
disabled.

Done in <5.14 ebuilds as well to ensure this doesn't get lost if
these branches gain 5.14 compat.

Thanks-to: Abulhair Saparov
Closes: https://bugs.gentoo.org/819234
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild      | 1 +
 x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild    | 1 +
 x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild    | 1 +
 x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild    | 1 +
 x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild       | 1 +
 x11-drivers/nvidia-drivers/nvidia-drivers-495.29.05-r1.ebuild | 1 +
 6 files changed, 6 insertions(+)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
index f85a6e3a7a1..6dd404a7538 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
@@ -90,6 +90,7 @@ pkg_setup() {
 		~DRM_KMS_HELPER
 		~SYSVIPC
 		~!AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
+		~!DRM_SIMPLEDRM
 		~!LOCKDEP
 		!DEBUG_MUTEXES"
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
index 29ce7c8d9dd..22766ad817b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
@@ -88,6 +88,7 @@ pkg_setup() {
 		PROC_FS
 		~DRM_KMS_HELPER
 		~SYSVIPC
+		~!DRM_SIMPLEDRM
 		~!LOCKDEP
 		!DEBUG_MUTEXES"
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild
index 406ac0e96fc..339b76113b7 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild
@@ -93,6 +93,7 @@ pkg_setup() {
 		PROC_FS
 		~DRM_KMS_HELPER
 		~SYSVIPC
+		~!DRM_SIMPLEDRM
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES"

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild
index c4d23b1df07..75fbefe3ae1 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild
@@ -92,6 +92,7 @@ pkg_setup() {
 		PROC_FS
 		~DRM_KMS_HELPER
 		~SYSVIPC
+		~!DRM_SIMPLEDRM
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES"

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild
index 9d38a366a0c..4ed640db860 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild
@@ -93,6 +93,7 @@ pkg_setup() {
 		PROC_FS
 		~DRM_KMS_HELPER
 		~SYSVIPC
+		~!DRM_SIMPLEDRM
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES"

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.29.05-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.29.05-r1.ebuild
index a6ff5fae1f5..24c586d62ca 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.29.05-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.29.05-r1.ebuild
@@ -89,6 +89,7 @@ pkg_setup() {
 		PROC_FS
 		~DRM_KMS_HELPER
 		~SYSVIPC
+		~!DRM_SIMPLEDRM
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES"