Skip to content

Commit 66fc259

Browse files
ptr1337ptr1337
committed
6.15: Apply NVIDIA patches properly
Signed-off-by: Peter Jung <admin@ptr1337.dev>
1 parent b9fd92d commit 66fc259

8 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎linux-cachyos-bmq/PKGBUILD‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,14 @@ fi
207207
# NVIDIA pre-build module support
208208
if [ "$_build_nvidia" = "yes" ]; then
209209
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
210-
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
210+
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
211+
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
211212
fi
212213

213214
if [ "$_build_nvidia_open" = "yes" ]; then
214215
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
215216
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
216-
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch"
217-
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
217+
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch")
218218
fi
219219

220220
## List of CachyOS schedulers
@@ -458,6 +458,7 @@ prepare() {
458458

459459
# Use fbdev and modeset as default
460460
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
461+
patch -Np1 -i "${srcdir}/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch" -d "${srcdir}/${_nv_pkg}/kernel"
461462
fi
462463

463464
if [ "$_build_nvidia_open" = "yes" ]; then

‎linux-cachyos-bore/PKGBUILD‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,14 @@ fi
207207
# NVIDIA pre-build module support
208208
if [ "$_build_nvidia" = "yes" ]; then
209209
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
210-
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
210+
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
211+
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
211212
fi
212213

213214
if [ "$_build_nvidia_open" = "yes" ]; then
214215
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
215216
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
216-
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch"
217-
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
217+
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch")
218218
fi
219219

220220
## List of CachyOS schedulers
@@ -458,6 +458,7 @@ prepare() {
458458

459459
# Use fbdev and modeset as default
460460
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
461+
patch -Np1 -i "${srcdir}/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch" -d "${srcdir}/${_nv_pkg}/kernel"
461462
fi
462463

463464
if [ "$_build_nvidia_open" = "yes" ]; then

‎linux-cachyos-deckify/PKGBUILD‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,12 @@
7575
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
7676
: "${_hugepage:=always}"
7777

78-
# CPU compiler optimizations - Defaults to prompt at kernel config if left empty
79-
# AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3" "zen4"
80-
# Intel CPUs : "mpsc"(P4 & older Netburst based Xeon) "atom" "core2" "nehalem" "westmere" "silvermont" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylakex" "cannonlake" "icelake" "goldmont" "goldmontplus" "cascadelake" "cooperlake" "tigerlake" "sapphirerapids" "rocketlake" "alderlake"
81-
# Other options :
82-
# - "native_amd" (use compiler autodetection - Selecting your arch manually in the list above is recommended instead of this option)
83-
# - "native_intel" (use compiler autodetection and will prompt for P6_NOPS - Selecting your arch manually in the list above is recommended instead of this option)
78+
# CPU compiler optimizations - Defaults to native if left empty
79+
# - "native" (use compiler autodetection)
80+
# - "zen4" (Use znver4 compiler optimizations)
8481
# - "generic" (kernel's default - to share the package between machines with different CPU µarch as long as they are x86-64)
85-
#
8682
: "${_processor_opt:=}"
8783

88-
# This does automatically detect your supported CPU and optimizes for it
89-
: "${_use_auto_optimization:=yes}"
90-
9184
# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
9285
# ATTENTION - one of three predefined values should be selected!
9386
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
@@ -185,7 +178,6 @@ _nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
185178
source=(
186179
"https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
187180
"config"
188-
"auto-cpu-optimization.sh"
189181
"${_patchsource}/all/0001-cachyos-base-all.patch"
190182
"${_patchsource}/misc/0001-acpi-call.patch"
191183
"${_patchsource}/misc/0001-handheld.patch")
@@ -210,13 +202,14 @@ fi
210202
# ZFS support
211203
if [ "$_build_zfs" = "yes" ]; then
212204
makedepends+=(git)
213-
source+=("git+https://github.com/cachyos/zfs.git#commit=92f430b00f42964b63aee373fbf6598a20f6c0cc")
205+
source+=("git+https://github.com/cachyos/zfs.git#commit=782aa343af935fa23b16ea849c63cc023aac3363")
214206
fi
215207

216208
# NVIDIA pre-build module support
217209
if [ "$_build_nvidia" = "yes" ]; then
218210
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
219-
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
211+
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
212+
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
220213
fi
221214

222215
if [ "$_build_nvidia_open" = "yes" ]; then
@@ -466,6 +459,7 @@ prepare() {
466459

467460
# Use fbdev and modeset as default
468461
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
462+
patch -Np1 -i "${srcdir}/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch" -d "${srcdir}/${_nv_pkg}/kernel"
469463
fi
470464

471465
if [ "$_build_nvidia_open" = "yes" ]; then

‎linux-cachyos-eevdf/PKGBUILD‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,14 @@ fi
207207
# NVIDIA pre-build module support
208208
if [ "$_build_nvidia" = "yes" ]; then
209209
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
210-
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
210+
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
211+
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
211212
fi
212213

213214
if [ "$_build_nvidia_open" = "yes" ]; then
214215
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
215216
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
216-
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch"
217-
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
217+
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch")
218218
fi
219219

220220
## List of CachyOS schedulers
@@ -458,6 +458,7 @@ prepare() {
458458

459459
# Use fbdev and modeset as default
460460
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
461+
patch -Np1 -i "${srcdir}/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch" -d "${srcdir}/${_nv_pkg}/kernel"
461462
fi
462463

463464
if [ "$_build_nvidia_open" = "yes" ]; then

‎linux-cachyos-rc/PKGBUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,14 @@ fi
232232
# NVIDIA pre-build module support
233233
if [ "$_build_nvidia" = "yes" ]; then
234234
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
235-
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
235+
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
236+
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
236237
fi
237238

238239
if [ "$_build_nvidia_open" = "yes" ]; then
239240
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
240241
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
241-
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch"
242-
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
242+
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch")
243243
fi
244244

245245
# Use generated AutoFDO Profile

‎linux-cachyos-rt-bore/PKGBUILD‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,14 @@ fi
207207
# NVIDIA pre-build module support
208208
if [ "$_build_nvidia" = "yes" ]; then
209209
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
210-
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
210+
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
211+
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
211212
fi
212213

213214
if [ "$_build_nvidia_open" = "yes" ]; then
214215
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
215216
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
216-
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch"
217-
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
217+
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch")
218218
fi
219219

220220
## List of CachyOS schedulers
@@ -458,6 +458,7 @@ prepare() {
458458

459459
# Use fbdev and modeset as default
460460
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
461+
patch -Np1 -i "${srcdir}/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch" -d "${srcdir}/${_nv_pkg}/kernel"
461462
fi
462463

463464
if [ "$_build_nvidia_open" = "yes" ]; then

‎linux-cachyos-server/PKGBUILD‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,14 @@ fi
207207
# NVIDIA pre-build module support
208208
if [ "$_build_nvidia" = "yes" ]; then
209209
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
210-
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
210+
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
211+
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
211212
fi
212213

213214
if [ "$_build_nvidia_open" = "yes" ]; then
214215
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
215216
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
216-
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch"
217-
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
217+
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch")
218218
fi
219219

220220
## List of CachyOS schedulers
@@ -454,6 +454,7 @@ prepare() {
454454

455455
# Use fbdev and modeset as default
456456
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
457+
patch -Np1 -i "${srcdir}/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch" -d "${srcdir}/${_nv_pkg}/kernel"
457458
fi
458459

459460
if [ "$_build_nvidia_open" = "yes" ]; then

‎linux-cachyos/PKGBUILD‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,14 @@ fi
232232
# NVIDIA pre-build module support
233233
if [ "$_build_nvidia" = "yes" ]; then
234234
source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
235-
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
235+
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
236+
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
236237
fi
237238

238239
if [ "$_build_nvidia_open" = "yes" ]; then
239240
source+=("https://download.nvidia.com/XFree86/${_nv_open_pkg%"-$_nv_ver"}/${_nv_open_pkg}.tar.xz"
240241
"${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
241-
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch"
242-
"${_patchsource}/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch")
242+
"${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch")
243243
fi
244244

245245
# Use generated AutoFDO Profile
@@ -519,6 +519,7 @@ prepare() {
519519

520520
# Use fbdev and modeset as default
521521
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
522+
patch -Np1 -i "${srcdir}/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch" -d "${srcdir}/${_nv_pkg}/kernel"
522523
fi
523524

524525
if [ "$_build_nvidia_open" = "yes" ]; then

0 commit comments

Comments
 (0)