commit:     d5c0621072a1e7c017cd31fe5b547a5fffb5282f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  6 09:54:29 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 10:06:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c06210

x11-drivers/nvidia-drivers: adjust IBT warning yet again

Sounds it may cause more issues than just failing to load modules
(cuda/nvenc notably). Can't confirm myself, but let's stay on the
safe side for now.

0/390 branch gets a different message given it should most likely
do fail to load, and CUDA/NVENC are no longer usable with it using
in-tree packages anyway.

Eventually this may end up better suited for the wiki than the
ebuild. Does not help that this is noisy for everyone when using
prebuilt gentoo-kernel-bin even if their CPU does not support it.

Bug: https://bugs.gentoo.org/911142
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild    | 7 ++++---
 x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild | 7 ++++---
 x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild | 7 ++++---
 x11-drivers/nvidia-drivers/nvidia-drivers-525.47.35.ebuild  | 7 ++++---
 x11-drivers/nvidia-drivers/nvidia-drivers-535.86.05.ebuild  | 7 ++++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index 41901b039ab5..fb18011df4b9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -101,9 +101,10 @@ pkg_setup() {
        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."
 
-       local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, *if* modules 
fail to load with ENDBR
-       errors, then try to either unset or pass ibt=off to the kernel
-       (default if no CPU support). Ignore this otherwise." # bug 911142
+       local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set and, if the 
CPU supports the feature,
+       this will likely lead to modules load failure with ENDBR errors.
+       Please ignore if not having issues, but otherwise try to unset or
+       pass ibt=off to the kernel's command line." #911142
 
        kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
index 176d15df8cfa..cdc8b467b5af 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
@@ -102,9 +102,10 @@ pkg_setup() {
        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."
 
-       local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, should be 
fine but *if* modules
-       fail to load with ENDBR errors, then try to either unset or pass ibt=off
-       to the kernel (default if no CPU support). Ignore this otherwise." # 
bug 911142
+       local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set and, if the 
CPU supports the feature,
+       this *could* lead to modules load failure with ENDBR errors, or to
+       broken CUDA/NVENC. Please ignore if not having issues, but otherwise
+       try to unset or pass ibt=off to the kernel's command line." #911142
 
        use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
index b11185284175..6c1640b652e4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
@@ -105,9 +105,10 @@ pkg_setup() {
        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."
 
-       local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, should be 
fine but *if* modules
-       fail to load with ENDBR errors, then try to either unset or pass ibt=off
-       to the kernel (default if no CPU support). Ignore this otherwise." # 
bug 911142
+       local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set and, if the 
CPU supports the feature,
+       this *could* lead to modules load failure with ENDBR errors, or to
+       broken CUDA/NVENC. Please ignore if not having issues, but otherwise
+       try to unset or pass ibt=off to the kernel's command line." #911142
        use kernel-open || CONFIG_CHECK+=" ~!X86_KERNEL_IBT"
 
        use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.35.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.35.ebuild
index 8421427a0a25..f831ede43356 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.35.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.35.ebuild
@@ -106,9 +106,10 @@ pkg_setup() {
        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."
 
-       local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, should be 
fine but *if* modules
-       fail to load with ENDBR errors, then try to either unset or pass ibt=off
-       to the kernel (default if no CPU support). Ignore this otherwise." # 
bug 911142
+       local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set and, if the 
CPU supports the feature,
+       this *could* lead to modules load failure with ENDBR errors, or to
+       broken CUDA/NVENC. Please ignore if not having issues, but otherwise
+       try to unset or pass ibt=off to the kernel's command line." #911142
        use kernel-open || CONFIG_CHECK+=" ~!X86_KERNEL_IBT"
 
        use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.86.05.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-535.86.05.ebuild
index a029fdff14f9..9e42306a21cd 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.86.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.86.05.ebuild
@@ -110,9 +110,10 @@ pkg_setup() {
        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."
 
-       local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, should be 
fine but *if* modules
-       fail to load with ENDBR errors, then try to either unset or pass ibt=off
-       to the kernel (default if no CPU support). Ignore this otherwise." # 
bug 911142
+       local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set and, if the 
CPU supports the feature,
+       this *could* lead to modules load failure with ENDBR errors, or to
+       broken CUDA/NVENC. Please ignore if not having issues, but otherwise
+       try to unset or pass ibt=off to the kernel's command line." #911142
        use kernel-open || CONFIG_CHECK+=" ~!X86_KERNEL_IBT"
 
        use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764

Reply via email to