Merge pull request #468 from dylanaraps/gpu-fix2

GPU: [Linux] Prefer dedicated card over integrated card.
This commit is contained in:
Dylan Araps 2016-12-02 12:21:13 +11:00 committed by GitHub
commit 739ac2678f

View file

@ -925,21 +925,11 @@ get_gpu() {
if [[ -f "/tmp/neofetch/gpu" ]]; then if [[ -f "/tmp/neofetch/gpu" ]]; then
source "/tmp/neofetch/gpu" source "/tmp/neofetch/gpu"
else else
bdf_number="$(PATH="/sbin:$PATH" lspci -k | grep -A2 -F 'VGA' | grep -B2 -F 'Kernel driver in use' | awk '/^\w/ {print $1}')" gpu="$(PATH="/sbin:$PATH" lspci -mm | awk -F '\\"|\\" \\"' '/Display|3D|VGA/ {print $3 " " $4}')"
if [[ -z "$bdf_number" ]]; then
# Fallback if no kernel driver is in use
gpu="$(PATH="/sbin:$PATH" lspci -mm | awk -F '\\"|\\" \\"' '/3D|VGA/ {print $3 " " $4}')"
else
# Find the currently used GPU by its BDF
gpu="$(PATH="/sbin:$PATH" lspci -mm | awk -v bdf_number="$bdf_number" -F '\\"|\\" \\"' '$0 ~ bdf_number {print $3 " " $4}')"
fi
case "$gpu" in case "$gpu" in
"intel"*) gpu="Intel Integrated Graphics" ;; *"advanced"*)
gpu="${gpu//Intel*$'\n'}"
"advanced"*)
gpu="${gpu/'[AMD/ATI]' }" gpu="${gpu/'[AMD/ATI]' }"
gpu="${gpu/'[AMD]' }" gpu="${gpu/'[AMD]' }"
gpu="${gpu/*\[}" gpu="${gpu/*\[}"
@ -947,7 +937,8 @@ get_gpu() {
gpu="AMD $gpu" gpu="AMD $gpu"
;; ;;
"nvidia"*) *"nvidia"*)
gpu="${gpu//Intel*$'\n'}"
gpu="${gpu/*\[}" gpu="${gpu/*\[}"
gpu="${gpu/\]*}" gpu="${gpu/\]*}"
gpu="NVIDIA $gpu" gpu="NVIDIA $gpu"
@ -957,6 +948,10 @@ get_gpu() {
gpu="VirtualBox Graphics Adapter" gpu="VirtualBox Graphics Adapter"
;; ;;
esac esac
[[ "$gpu" =~ "intel" ]] && \
gpu="Intel Integrated Graphics"
cache "gpu" "$gpu" "/tmp" cache "gpu" "$gpu" "/tmp"
fi fi
;; ;;