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

[Ionen Wolkens]

commit:     ee53ee5f48e755f924dec26af84099c07d8b0154
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 19:15:59 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 19:30:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee53ee5f

x11-drivers/nvidia-drivers: remove simpledrm warnings

Looking more closely at this, do not believe it's worth keeping
anymore unlike back on kernel 5.14.x -- seeing more favorable
reports and not to mention this affects the console which
nvidia-drivers has no real interaction with beside restoring the
mode when switching from Xorg (i.e. not this package's issue).

gentoo-kernel-bin's fedora configs for 5.16 may end up defaulting
to this, and the message will just be noise that can't be changed.

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

 x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild      | 7 +------
 x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild | 7 +------
 x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild    | 7 +------
 x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild       | 7 +------
 x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild    | 7 +------
 x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild   | 7 +------
 x11-drivers/nvidia-drivers/nvidia-drivers-510.39.01.ebuild    | 7 +------
 7 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
index 9d31c7cbbde0..e7fee209d9c3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
@@ -87,7 +87,6 @@ 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
@@ -95,11 +94,7 @@ pkg_setup() {
 	With 390.xx drivers, also used by a GLX workaround needed for OpenGL.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in.
-	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
-	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
-	console with a NVIDIA GPU. If you experience issues, try
-	disabling it and instead use FB_EFI or FB_SIMPLE for now."
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
 
 	kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild
index 61cd98588ec9..6b7fc4bcc333 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild
@@ -86,18 +86,13 @@ 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
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in.
-	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
-	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
-	console with a NVIDIA GPU. If you experience issues, try
-	disabling it and instead use FB_EFI or FB_SIMPLE for now."
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
index d8e4a49beeb8..831c5ece32fc 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
@@ -89,7 +89,6 @@ pkg_setup() {
 		PROC_FS
 		~DRM_KMS_HELPER
 		~SYSVIPC
-		~!DRM_SIMPLEDRM
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES"
@@ -97,11 +96,7 @@ pkg_setup() {
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in.
-	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
-	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
-	console with a NVIDIA GPU. If you experience issues, try
-	disabling it and instead use FB_EFI or FB_SIMPLE for now."
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
index f3cf9ad5a687..b9cffc23b584 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
@@ -89,7 +89,6 @@ pkg_setup() {
 		PROC_FS
 		~DRM_KMS_HELPER
 		~SYSVIPC
-		~!DRM_SIMPLEDRM
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES"
@@ -97,11 +96,7 @@ pkg_setup() {
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in.
-	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
-	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
-	console with a NVIDIA GPU. If you experience issues, try
-	disabling it and instead use FB_EFI or FB_SIMPLE for now."
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
index 9450abe262e9..06cbc4cb8e37 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
@@ -91,7 +91,6 @@ pkg_setup() {
 		PROC_FS
 		~DRM_KMS_HELPER
 		~SYSVIPC
-		~!DRM_SIMPLEDRM
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES"
@@ -99,11 +98,7 @@ pkg_setup() {
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in.
-	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
-	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
-	console with a NVIDIA GPU. If you experience issues, try
-	disabling it and instead use FB_EFI or FB_SIMPLE for now."
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
index 79114a2201a3..a9721ecd11e4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
@@ -91,7 +91,6 @@ pkg_setup() {
 		PROC_FS
 		~DRM_KMS_HELPER
 		~SYSVIPC
-		~!DRM_SIMPLEDRM
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES"
@@ -99,11 +98,7 @@ pkg_setup() {
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in.
-	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
-	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
-	console with a NVIDIA GPU. If you experience issues, try
-	disabling it and instead use FB_EFI or FB_SIMPLE for now."
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.39.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.39.01.ebuild
index d4362145a76a..8c2de5023e60 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.39.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.39.01.ebuild
@@ -90,7 +90,6 @@ pkg_setup() {
 		PROC_FS
 		~DRM_KMS_HELPER
 		~SYSVIPC
-		~!DRM_SIMPLEDRM
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
 		!DEBUG_MUTEXES"
@@ -98,11 +97,7 @@ pkg_setup() {
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in.
-	Note: DRM_SIMPLEDRM may cause issues and may be better disabled for now."
-	local ERROR_DRM_SIMPLEDRM="CONFIG_DRM_SIMPLEDRM: is set but may or may not lead to a blank
-	console with a NVIDIA GPU. If you experience issues, try
-	disabling it and instead use FB_EFI or FB_SIMPLE for now."
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764