From 8c77ac78b8aa9256e6b4c22257d730c7b4125205 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Sat, 1 Feb 2025 12:36:37 +0100 Subject: [PATCH] nvidia: Use the nvidia-open module for blackwell support Signed-off-by: Peter Jung --- archiso/airootfs/usr/local/bin/removeun | 2 +- .../efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf | 2 +- archiso/grub/grub.cfg | 4 ++-- archiso/packages_desktop.x86_64 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/archiso/airootfs/usr/local/bin/removeun b/archiso/airootfs/usr/local/bin/removeun index 4a322b2..e68b678 100755 --- a/archiso/airootfs/usr/local/bin/removeun +++ b/archiso/airootfs/usr/local/bin/removeun @@ -43,7 +43,7 @@ local _packages_to_remove=( local _check_nvidia_card="$(chwd --is_nvidia_card | grep -q 'NVIDIA card found!'; echo $?)" if [[ "${_check_nvidia_card}" -ne 0 ]]; then echo "No NVIDIA card detected. Removing nvidia drivers" - _packages_to_remove+=(linux-cachyos-nvidia nvidia-utils egl-wayland) + _packages_to_remove+=(linux-cachyos-nvidia-open nvidia-utils egl-wayland) fi local xx diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf index 697833c..652a3a3 100644 --- a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf +++ b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf @@ -1,4 +1,4 @@ -title CachyOS x86_64 UEFI NVIDIA (latest cards only) +title CachyOS x86_64 UEFI NVIDIA (Turing or newer (20xx)) sort-key B linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index d9688c8..0b8d5da 100644 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -1,6 +1,6 @@ # Defining the Version of the ISO. This line could be easy changed by a Script wich do that automatic before creating ISO self. # Default "GIT", because if somebody outside from the DEVs create a ISO, this ISO wouldnt have a specific Version number. -CACHYOS_VERSION="241105" +CACHYOS_VERSION="250131" if [ "${grub_platform}" == 'efi' ]; then bios_or_uefi='(UEFI)!' @@ -59,7 +59,7 @@ menuentry "CachyOS" --class arch --class gnu-linux --class gnu --class os --id ' initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img } -menuentry "CachyOS with NVIDIA closed-source Driver (latest cards only 900+)" --class arch --class gnu-linux --class gnu --class os --id 'cachyos-nvidia' { +menuentry "CachyOS with NVIDIA open-source module (latest cards only 20xx++)" --class arch --class gnu-linux --class gnu --class os --id 'cachyos-nvidia' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 amdgpu.modeset=1 nvme_load=yes module_blacklist=pcspkr initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img diff --git a/archiso/packages_desktop.x86_64 b/archiso/packages_desktop.x86_64 index 92397f5..bcb102d 100644 --- a/archiso/packages_desktop.x86_64 +++ b/archiso/packages_desktop.x86_64 @@ -78,7 +78,7 @@ libusb-compat libwnck3 linux-atm linux-cachyos -linux-cachyos-nvidia +linux-cachyos-nvidia-open linux-cachyos-zfs linux-firmware linux-firmware-marvell