feat: NVIDIA fix only for RTX 20 series or newer, with the VRAM booster's chwd legacy check (vram_nvidia_legacy_id)

lib/nvidia.sh

@@ -4,7 +4,8 @@
 # through DRM/KMS; with NVIDIA that needs kernel modesetting and the
 # framebuffer driver (nvidia-drm.modeset=1 nvidia-drm.fbdev=1) and the
 # driver in the initramfs, or the screen shows a corrupted image.
-# Does nothing without an NVIDIA GPU that has its driver installed.
+# Does nothing without a supported NVIDIA GPU (RTX 20 series or newer) that has
+# its driver installed.
 # Sourced by steamify.sh; not meant to be run on its own.
 
 NVIDIA_PARAMS="nvidia-drm.modeset=1 nvidia-drm.fbdev=1"
@@ -16,15 +17,31 @@ NVIDIA_HOOK=${NVIDIA_HOOK:-/etc/pacman.d/hooks/85-steamify-nvidia-initramfs.hook
 NVIDIA_DRM_DIR=${NVIDIA_DRM_DIR:-/sys/class/drm}
 
 nvidia_present() {
-    # An NVIDIA GPU (PCI vendor 0x10de, display class) and its kernel driver.
+    # A supported NVIDIA GPU: PCI vendor 0x10de, display class, its kernel
+    # driver installed, and not older than the RTX 20 series, decided like the
+    # VRAM booster does (vram_nvidia_legacy_id: chwd's legacy card lists, every
+    # other card runs NVIDIA's open modules). Older cards are left alone.
     local d
     for d in "$NVIDIA_DRM_DIR"/card[0-9]*/device; do
         [[ "$(cat "$d/vendor" 2>/dev/null)" == 0x10de ]] || continue
-        [[ "$(cat "$d/class" 2>/dev/null)" == 0x03* ]] && modinfo nvidia_drm >/dev/null 2>&1 && return 0
+        [[ "$(cat "$d/class" 2>/dev/null)" == 0x03* ]] || continue
+        vram_nvidia_legacy_id "$(cat "$d/device" 2>/dev/null)" && continue
+        modinfo nvidia_drm >/dev/null 2>&1 && return 0
     done
     return 1
 }
 
+nvidia_legacy_gpu() {
+    # 0 when the only NVIDIA GPU(s) are older than RTX 20 (reported, not fixed).
+    local d found=0
+    for d in "$NVIDIA_DRM_DIR"/card[0-9]*/device; do
+        [[ "$(cat "$d/vendor" 2>/dev/null)" == 0x10de && "$(cat "$d/class" 2>/dev/null)" == 0x03* ]] || continue
+        vram_nvidia_legacy_id "$(cat "$d/device" 2>/dev/null)" || return 1
+        found=1
+    done
+    [[ $found == 1 ]]
+}
+
 nvidia_boot_file() {
     # Same boot loaders as the kernel command line elsewhere (lib/hdmi-refresh.sh).
     hdmi_boot_file

lib/vram-booster.sh

@@ -44,6 +44,13 @@ vram_nvidia() {
 # 470xx, 390xx); every other NVIDIA card runs the open kernel modules.
 VRAM_CHWD_IDS=/var/lib/chwd/ids
 
+vram_nvidia_legacy_id() {
+    # vram_nvidia_legacy_id <pci device id, with or without 0x>: 0 when chwd
+    # lists the card for a closed legacy branch, i.e. it is older than the
+    # RTX 20 series. Also what lib/nvidia.sh uses to decide if a card is supported.
+    grep -qwi "${1#0x}" "$VRAM_CHWD_IDS"/nvidia-*.ids 2>/dev/null
+}
+
 vram_nvidia_case() {
     # Why an NVIDIA card's VRAM isn't registered, so the menu can say what to
     # do: "update" (open modules older than 615), "switch <chwd profile>"
@@ -62,8 +69,7 @@ vram_nvidia_case() {
     esac
     for d in /sys/bus/pci/devices/*; do
         [[ "$(cat "$d/vendor" 2>/dev/null)" == 0x10de && "$(cat "$d/class" 2>/dev/null)" == 0x03* ]] || continue
-        id="$(cat "$d/device")"; id="${id#0x}"
-        grep -qwi "$id" "$VRAM_CHWD_IDS"/nvidia-*.ids 2>/dev/null && { echo legacy; return; }
+        vram_nvidia_legacy_id "$(cat "$d/device")" && { echo legacy; return; }
     done
     for p in 580xx 470xx 390xx; do
         pacman -Q "nvidia-$p-dkms" >/dev/null 2>&1 && { echo "switch nvidia-dkms-$p"; return; }