commit: b7e8fd33216e094df447d2b5a1a20d15616f8fd9 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Oct 11 13:27:28 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Oct 11 13:58:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e8fd33
x11-drivers/nvidia-drivers: check for CONFIG_X86_PAT NVIDIA has a fallback implementation if unset, but it uses __flush_tlb removed on x86 since >=5.8 kernels (albeit fairly unlikely to be unset given default and gated behind EXPERT=y). All versions are affected. Closes: https://bugs.gentoo.org/817764 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild | 2 ++ x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild | 2 ++ x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild | 2 ++ x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild | 2 ++ x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild | 2 ++ 5 files changed, 10 insertions(+) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild index 669f669cd41..f85a6e3a7a1 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild @@ -98,6 +98,8 @@ pkg_setup() { options such as CONFIG_DRM_FBDEV_EMULATION instead. 390.xx branch: also used by a GLX workaround needed for OpenGL." + use amd64 || use x86 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764 + BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"' use x86 && BUILD_PARAMS+=' ARCH=i386' # needed for recognition BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules 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 6d71ba06004..29ce7c8d9dd 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild @@ -95,6 +95,8 @@ pkg_setup() { Cannot be directly selected in the kernel's menuconfig, so enable options such as CONFIG_DRM_FBDEV_EMULATION instead." + use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764 + BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"' BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules MODULE_NAMES=" 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 9f201131b30..406ac0e96fc 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild @@ -101,6 +101,8 @@ pkg_setup() { Cannot be directly selected in the kernel's menuconfig, so enable options such as CONFIG_DRM_FBDEV_EMULATION instead." + kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764 + MODULE_NAMES=" nvidia(video:kernel) nvidia-drm(video:kernel) 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 6f30694aade..c4d23b1df07 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild @@ -100,6 +100,8 @@ pkg_setup() { Cannot be directly selected in the kernel's menuconfig, so enable options such as CONFIG_DRM_FBDEV_EMULATION instead." + use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764 + MODULE_NAMES=" nvidia(video:kernel) nvidia-drm(video:kernel) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild index f9aedac372c..9d38a366a0c 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild @@ -101,6 +101,8 @@ pkg_setup() { Cannot be directly selected in the kernel's menuconfig, so enable options such as CONFIG_DRM_FBDEV_EMULATION instead." + use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764 + MODULE_NAMES=" nvidia(video:kernel) nvidia-drm(video:kernel)
