summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorSimon Rettberg2016-04-01 14:57:30 +0200
committerSimon Rettberg2016-04-01 14:57:30 +0200
commitc4afedbb9e8084f62f2ee77afb28363243ed4de8 (patch)
tree6b600db8d7fa0ede83ffe19eee5a68da1783c3b2 /remote/rootfs
parent[kdm-theme-bwlp] Patch theme with warnings about suboptimal hw config (diff)
downloadtm-scripts-c4afedbb9e8084f62f2ee77afb28363243ed4de8.tar.gz
tm-scripts-c4afedbb9e8084f62f2ee77afb28363243ed4de8.tar.xz
tm-scripts-c4afedbb9e8084f62f2ee77afb28363243ed4de8.zip
(3D) Whitelist another i915 pciid and nvidia quadro K420
Diffstat (limited to 'remote/rootfs')
-rw-r--r--remote/rootfs/rootfs-stage31/templates/drm.cfg2
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver6
2 files changed, 4 insertions, 4 deletions
diff --git a/remote/rootfs/rootfs-stage31/templates/drm.cfg b/remote/rootfs/rootfs-stage31/templates/drm.cfg
index bbfa3bc0..946ebf0b 100644
--- a/remote/rootfs/rootfs-stage31/templates/drm.cfg
+++ b/remote/rootfs/rootfs-stage31/templates/drm.cfg
@@ -7,10 +7,12 @@
# 10de-11c0: nvidia Geforce GTX 660 (OG)
# 10de-0fc2: nvidia GeForce GT 630 (OG)
# 10de-0dd8: nvidia Quadro 2000
+# 10de-0ff3: nvidia Quadro K420
##
10de:11c0 @nvidia
10de:0fc2 @nvidia
10de:0dd8 @nvidia
+10de:0ff3 @nvidia
## intel
# Dell GX 620
8086:2772 i915
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver
index 8cdf21fa..4e5db21a 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver
@@ -7,12 +7,10 @@ if ! lspci -n > "$PCIFILE"; then
exit 1
fi
-if grep -E ' (8086:0152|8086:0412|8086:0416|1002:6779)( |$)' "$PCIFILE" > /dev/null; then
+if grep -q -E ' (8086:0152|8086:0162|8086:0412|8086:0416|1002:6779)( |$)' "$PCIFILE"; then
echo "i915 - enable 3D"
echo -e "# Written by load-gfx-driver\nSLX_VMWARE_3D=yes" >> "/opt/openslx/config"
-fi
-
-if lsmod | grep -q '^nvidia\s'; then
+elif lsmod | grep -q '^nvidia\s'; then
# nvidia kernel module was loaded in stage31 - download libs
systemctl start setup-slx-addon@nvidia_libs &
echo -e "# Written by load-gfx-driver\nSLX_VMWARE_3D=yes" >> "/opt/openslx/config"