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

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

commit:     b4f348c54c033f440fa836d12d5e351196445fec
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 06:16:18 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 08:00:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f348c5

x11-drivers/nvidia-drivers: set error message for DRM_SIMPLEDRM

Still having a hard time to get this to work on my hardware,
but Fedora is pushing that option and trying to enable it by
default now. May be good to give an explanation so users can
more easily choose if they can ignore the warning or not.

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

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

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
index 91079696f2d2..9d31c7cbbde0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
@@ -96,7 +96,10 @@ pkg_setup() {
 	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 is better disabled for now."
+	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."
 
 	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 430cd3d9481a..61cd98588ec9 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
@@ -94,7 +94,10 @@ pkg_setup() {
 	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 is better disabled for now."
+	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."
 
 	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 439dc1557ce9..d8e4a49beeb8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
@@ -98,7 +98,10 @@ pkg_setup() {
 	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 is better disabled for now."
+	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."
 
 	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 f82e09b89d17..f3cf9ad5a687 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
@@ -98,7 +98,10 @@ pkg_setup() {
 	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 is better disabled for now."
+	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."
 
 	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 a8f44500097e..9450abe262e9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
@@ -100,7 +100,10 @@ pkg_setup() {
 	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 is better disabled for now."
+	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."
 
 	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 78b8be650a52..79114a2201a3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
@@ -100,7 +100,10 @@ pkg_setup() {
 	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 is better disabled for now."
+	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."
 
 	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 fd3168e23f87..d4362145a76a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.39.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.39.01.ebuild
@@ -99,7 +99,10 @@ pkg_setup() {
 	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 is better disabled for now."
+	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."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764