Compare commits

...

4 commits

Author SHA1 Message Date
Dylan Araps
c902c2d69e general: Fix travis 2017-12-23 22:35:25 +11:00
Dylan Araps
efa9ff6726 gpu [linux]: Add clock speed 2017-12-23 22:28:13 +11:00
Dylan Araps
0e59d6c041 gpu [linux]: Add clock speed 2017-12-23 22:25:13 +11:00
Dylan Araps
8e29cd00b3 gpu [linux]: Add clock speed 2017-12-23 22:20:50 +11:00

View file

@ -1212,7 +1212,7 @@ get_gpu() {
# Read GPUs into array. # Read GPUs into array.
IFS=$'\n' IFS=$'\n'
gpus=($(lspci -mm | awk -F '\\"|\\" \\"|\\(' \ gpus=($(lspci -mm | awk -F '\\"|\\" \\"|\\(' \
'/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END{for(i in a) '/"Display|"3D|"VGA/ {a[$0] = $1 $3 " " $4} END{for(i in a)
{if(!seen[a[i]]++) print a[i]}}')) {if(!seen[a[i]]++) print a[i]}}'))
IFS="$old_ifs" IFS="$old_ifs"
@ -1244,6 +1244,10 @@ get_gpu() {
;; ;;
*"intel"*) *"intel"*)
# (sorry)
freq="$(< /sys/devices/pci0000:00/0000:\
"${gpu/ *}"/drm/card0/gt_cur_freq_mhz)"
type -p glxinfo >/dev/null && \ type -p glxinfo >/dev/null && \
gpu="$(glxinfo | grep "Device:.*Intel")" gpu="$(glxinfo | grep "Device:.*Intel")"
@ -1266,7 +1270,8 @@ get_gpu() {
gpu="${gpu/Intel }" gpu="${gpu/Intel }"
fi fi
prin "${subtitle:+${subtitle}${gpu_name}}" "$gpu" prin "${subtitle:+${subtitle}${gpu_name}}" "$gpu ${freq:+@ ${freq}Mhz}"
((++gpu_num)) ((++gpu_num))
done done