Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/
Date: Mon, 11 Oct 2021 13:59:55
Message-Id: 1633960686.b7e8fd33216e094df447d2b5a1a20d15616f8fd9.ionen@gentoo
1 commit: b7e8fd33216e094df447d2b5a1a20d15616f8fd9
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 11 13:27:28 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 11 13:58:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e8fd33
7
8 x11-drivers/nvidia-drivers: check for CONFIG_X86_PAT
9
10 NVIDIA has a fallback implementation if unset, but it uses
11 __flush_tlb removed on x86 since >=5.8 kernels (albeit fairly
12 unlikely to be unset given default and gated behind EXPERT=y).
13
14 All versions are affected.
15
16 Closes: https://bugs.gentoo.org/817764
17 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
18
19 x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild | 2 ++
20 x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild | 2 ++
21 x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild | 2 ++
22 x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild | 2 ++
23 x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild | 2 ++
24 5 files changed, 10 insertions(+)
25
26 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
27 index 669f669cd41..f85a6e3a7a1 100644
28 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
29 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
30 @@ -98,6 +98,8 @@ pkg_setup() {
31 options such as CONFIG_DRM_FBDEV_EMULATION instead.
32 390.xx branch: also used by a GLX workaround needed for OpenGL."
33
34 + use amd64 || use x86 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
35 +
36 BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
37 use x86 && BUILD_PARAMS+=' ARCH=i386' # needed for recognition
38 BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
39
40 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
41 index 6d71ba06004..29ce7c8d9dd 100644
42 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
43 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
44 @@ -95,6 +95,8 @@ pkg_setup() {
45 Cannot be directly selected in the kernel's menuconfig, so enable
46 options such as CONFIG_DRM_FBDEV_EMULATION instead."
47
48 + use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
49 +
50 BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
51 BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
52 MODULE_NAMES="
53
54 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild
55 index 9f201131b30..406ac0e96fc 100644
56 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild
57 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild
58 @@ -101,6 +101,8 @@ pkg_setup() {
59 Cannot be directly selected in the kernel's menuconfig, so enable
60 options such as CONFIG_DRM_FBDEV_EMULATION instead."
61
62 + kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
63 +
64 MODULE_NAMES="
65 nvidia(video:kernel)
66 nvidia-drm(video:kernel)
67
68 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild
69 index 6f30694aade..c4d23b1df07 100644
70 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild
71 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild
72 @@ -100,6 +100,8 @@ pkg_setup() {
73 Cannot be directly selected in the kernel's menuconfig, so enable
74 options such as CONFIG_DRM_FBDEV_EMULATION instead."
75
76 + use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
77 +
78 MODULE_NAMES="
79 nvidia(video:kernel)
80 nvidia-drm(video:kernel)
81
82 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild
83 index f9aedac372c..9d38a366a0c 100644
84 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild
85 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild
86 @@ -101,6 +101,8 @@ pkg_setup() {
87 Cannot be directly selected in the kernel's menuconfig, so enable
88 options such as CONFIG_DRM_FBDEV_EMULATION instead."
89
90 + use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
91 +
92 MODULE_NAMES="
93 nvidia(video:kernel)
94 nvidia-drm(video:kernel)