From 451b39359d3475aec925dc55d51e2f7b33b8a101 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Sat, 9 Sep 2023 12:37:24 -0600 Subject: [PATCH] chore(hardware-setup): Only retrieve GPU info once --- system_files/desktop/shared/usr/bin/bazzite-hardware-setup | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup index 3e9ba3ba..8aa6e4e0 100755 --- a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup +++ b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup @@ -25,6 +25,7 @@ fi # GLOBAL SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)" +GPU_ID=$(lspci -k | grep -A 3 -E "(VGA|3D)") KARGS=$(rpm-ostree kargs) NEEDED_KARGS="" echo "Current kargs: $KARGS" @@ -83,7 +84,7 @@ elif [[ $IMAGE_NAME =~ "deck" ]]; then systemctl --global disable --now sdgyrodsu.service fi -if grep -qz "Kernel driver in use: radeon" <<< $(lspci -k | grep -A 3 -E "(VGA|3D)"); then +if grep -qz "Kernel driver in use: radeon" <<< $GPU_ID; then if [[ ! $KARGS =~ "radeon.si_support" ]]; then NEEDED_KARGS="$NEEDED_KARGS --append=radeon.si_support=0" fi @@ -99,7 +100,7 @@ if grep -qz "Kernel driver in use: radeon" <<< $(lspci -k | grep -A 3 -E "(VGA|3 if [[ ! $KARGS =~ "amdgpu.cik_support" ]]; then NEEDED_KARGS="$NEEDED_KARGS --append=amdgpu.cik_support=1" fi -elif grep -qvz "Kernel driver in use: amdgpu" <<< $(lspci -k | grep -A 3 -E "(VGA|3D)"); then +elif grep -qvz "Kernel driver in use: amdgpu" <<< $GPU_ID; then if [[ $KARGS =~ "radeon.si_support" ]]; then NEEDED_KARGS="$NEEDED_KARGS --delete=radeon.si_support=0" fi