diff options
| author | Simon Rettberg | 2019-03-12 12:38:05 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-03-12 12:38:05 +0100 |
| commit | e1ffd04f7524abcf67479f2905c15fc004584fb8 (patch) | |
| tree | 40a5e88d1a293690bae34e0354f6c6cca5977c7d | |
| parent | [kiosk-common] Only allow 132.230.0.0/16? Very smart! (diff) | |
| download | mltk-e1ffd04f7524abcf67479f2905c15fc004584fb8.tar.gz mltk-e1ffd04f7524abcf67479f2905c15fc004584fb8.tar.xz mltk-e1ffd04f7524abcf67479f2905c15fc004584fb8.zip | |
[rootfs-stage32/vmware-common] Always force 3D - don't lower hwversion
| -rw-r--r-- | core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc | 10 | ||||
| -rwxr-xr-x | core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc index b41a136f..4643e034 100644 --- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc +++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc @@ -205,11 +205,11 @@ setup_graphics() { if isset SLX_VMWARE_3D; then writelog "FORCE3D set - overriding 3D in vmx file." echo 'mks.gl.allowBlacklistedDrivers = "TRUE"' >> "${TMPCONFIG}" - # We override... play safe and cap the hwVersion to 10, since some i915 chips goofed up with 12 - # Investigate if we might have to do this in other cases where we don't override - if grep -qi '^mks.enable3d.*true' "${TMPCONFIG}"; then - vmw_cap_hw_version "10" - fi +# # We override... play safe and cap the hwVersion to 10, since some i915 chips goofed up with 12 +# # Investigate if we might have to do this in other cases where we don't override +# if grep -qi '^mks.enable3d.*true' "${TMPCONFIG}"; then +# vmw_cap_hw_version "10" +# fi else writelog "FORCE3D not set - 3D will only work if GPU/driver is whitelisted by vmware." fi diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver index 3e8719ac..b80bede7 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver +++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver @@ -11,10 +11,13 @@ if lsmod | grep -q '^nvidia\s'; then # nvidia kernel module was loaded in stage31 - download libs echo "Proprietary nvidia kernel drivers loaded - fetch user space libs" systemctl start setup-slx-addon@nvidia_libs & - echo -e "# Written by load-gfx-driver\nSLX_VMWARE_3D=yes" >> "/opt/openslx/config" + #echo -e "# Written by load-gfx-driver\nSLX_VMWARE_3D=yes" >> "/opt/openslx/config" elif grep -q -E ' (8086:0102|8086:0152|8086:0162|8086:0412|8086:0416|8086:041e|8086:0a16|8086:1626|8086:1912|8086:3e92|8086:5912|1002:6779|1002:68f9)( |$)' "$PCIFILE"; then echo "i915 - enable 3D" - echo -e "# Written by load-gfx-driver\nSLX_VMWARE_3D=yes" >> "/opt/openslx/config" + #echo -e "# Written by load-gfx-driver\nSLX_VMWARE_3D=yes" >> "/opt/openslx/config" fi +# Seems we can finally always do that; in fact, not doing so seems to crash VMs left and right +echo -e "# Written by load-gfx-driver\nSLX_VMWARE_3D=yes" >> "/opt/openslx/config" + exit 0 |