mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Merge pull request #4491 from johnzfitch/fix/pascal-maxwell-nvidia-backend
Expanded Legacy NVIDIA GPU support with correct backend selection
This commit is contained in:
@@ -4,12 +4,14 @@ if [ -n "$NVIDIA" ]; then
|
|||||||
# Check which kernel is installed and set appropriate headers package
|
# Check which kernel is installed and set appropriate headers package
|
||||||
KERNEL_HEADERS="$(pacman -Qqs '^linux(-zen|-lts|-hardened)?$' | head -1)-headers"
|
KERNEL_HEADERS="$(pacman -Qqs '^linux(-zen|-lts|-hardened)?$' | head -1)-headers"
|
||||||
|
|
||||||
if echo "$NVIDIA" | grep -qE "RTX [2-9][0-9]|GTX 16"; then
|
# Turing+ (GTX 16xx, RTX 20xx-50xx, Quadro RTX, datacenter A/H/T/L series) have GSP firmware
|
||||||
# Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
|
if echo "$NVIDIA" | grep -qE "GTX 16[0-9]{2}|RTX [2-5][0-9]{3}|Quadro RTX|RTX A[0-9]{4}|A[1-9][0-9]{2}|H[1-9][0-9]{2}|T4|L[0-9]+"; then
|
||||||
PACKAGES=(nvidia-open-dkms nvidia-utils lib32-nvidia-utils libva-nvidia-driver)
|
PACKAGES=(nvidia-open-dkms nvidia-utils lib32-nvidia-utils libva-nvidia-driver)
|
||||||
elif echo "$NVIDIA" | grep -qE "GTX 9|GTX 10|Quadro P|MX1|MX2|MX3"; then
|
GPU_ARCH="turing_plus"
|
||||||
# Pascal (10xx, Quadro Pxxx, MX150, MX2xx, and MX3xx) and Maxwell (9xx, MX110, and MX130) use legacy branch that can only be installed from AUR
|
# Maxwell (GTX 9xx), Pascal (GT/GTX 10xx, Quadro P, MX series), Volta (Titan V, Tesla V100, Quadro GV100) lack GSP
|
||||||
|
elif echo "$NVIDIA" | grep -qE "GTX (9[0-9]{2}|10[0-9]{2})|GT 10[0-9]{2}|Quadro [PM][0-9]{3,4}|Quadro GV100|MX *[0-9]+|Titan (X|Xp|V)|Tesla V100"; then
|
||||||
PACKAGES=(nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils)
|
PACKAGES=(nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils)
|
||||||
|
GPU_ARCH="maxwell_pascal_volta"
|
||||||
fi
|
fi
|
||||||
# Bail if no supported GPU
|
# Bail if no supported GPU
|
||||||
if [ -z "${PACKAGES+x}" ]; then
|
if [ -z "${PACKAGES+x}" ]; then
|
||||||
@@ -29,12 +31,23 @@ EOF
|
|||||||
MODULES+=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)
|
MODULES+=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Add NVIDIA environment variables
|
# Add NVIDIA environment variables based on GPU architecture
|
||||||
cat >>$HOME/.config/hypr/envs.conf <<'EOF'
|
if [ "$GPU_ARCH" = "turing_plus" ]; then
|
||||||
|
# Turing+ (RTX 20xx, GTX 16xx, and newer) with GSP firmware support
|
||||||
|
cat >>"$HOME/.config/hypr/envs.conf" <<'EOF'
|
||||||
|
|
||||||
# NVIDIA
|
# NVIDIA (Turing+ with GSP firmware)
|
||||||
env = NVD_BACKEND,direct
|
env = NVD_BACKEND,direct
|
||||||
env = LIBVA_DRIVER_NAME,nvidia
|
env = LIBVA_DRIVER_NAME,nvidia
|
||||||
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
|
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
|
||||||
EOF
|
EOF
|
||||||
|
elif [ "$GPU_ARCH" = "maxwell_pascal_volta" ]; then
|
||||||
|
# Maxwell/Pascal/Volta (GTX 9xx/10xx, GT 10xx, Quadro P/M/GV, MX series, Titan X/Xp/V) lack GSP firmware
|
||||||
|
cat >>"$HOME/.config/hypr/envs.conf" <<'EOF'
|
||||||
|
|
||||||
|
# NVIDIA (Maxwell/Pascal/Volta without GSP firmware)
|
||||||
|
env = NVD_BACKEND,egl
|
||||||
|
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
32
migrations/1770159912.sh
Normal file
32
migrations/1770159912.sh
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
echo "Fix NVIDIA environment variables for Maxwell/Pascal/Volta GPUs"
|
||||||
|
|
||||||
|
# Detect if user has Maxwell/Pascal/Volta GPU (pre-Turing cards without GSP firmware)
|
||||||
|
# Maxwell (GTX 9xx), Pascal (GT/GTX 10xx, Quadro P, MX series), Volta (Titan V, Tesla V100, Quadro GV100)
|
||||||
|
NVIDIA="$(lspci | grep -i 'nvidia')"
|
||||||
|
if echo "$NVIDIA" | grep -qE "GTX (9[0-9]{2}|10[0-9]{2})|GT 10[0-9]{2}|Quadro [PM][0-9]{3,4}|Quadro GV100|MX *[0-9]+|Titan (X|Xp|V)|Tesla V100"; then
|
||||||
|
ENVS_CONF="$HOME/.config/hypr/envs.conf"
|
||||||
|
|
||||||
|
if [ -f "$ENVS_CONF" ]; then
|
||||||
|
# Check if file contains problematic variables
|
||||||
|
if grep -qE "env = (NVD_BACKEND,direct|LIBVA_DRIVER_NAME,nvidia)" "$ENVS_CONF"; then
|
||||||
|
echo "Removing incompatible NVIDIA environment variables for legacy GPU..."
|
||||||
|
|
||||||
|
# Create backup
|
||||||
|
cp "$ENVS_CONF" "$ENVS_CONF.bak.$(date +%s)"
|
||||||
|
|
||||||
|
# Remove all NVIDIA env lines and section headers (we re-add the correct ones below)
|
||||||
|
sed -i '/^env = \(NVD_BACKEND\|LIBVA_DRIVER_NAME\|__GLX_VENDOR_LIBRARY_NAME\),/d; /^# NVIDIA/d' "$ENVS_CONF"
|
||||||
|
|
||||||
|
# Add correct environment variables for legacy GPUs
|
||||||
|
cat >>"$ENVS_CONF" <<'EOF'
|
||||||
|
|
||||||
|
# NVIDIA (Maxwell/Pascal/Volta without GSP firmware)
|
||||||
|
env = NVD_BACKEND,egl
|
||||||
|
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo "NVIDIA environment variables updated. A backup was saved to $ENVS_CONF.bak.*"
|
||||||
|
echo "Please restart Hyprland for changes to take effect."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
Reference in New Issue
Block a user