diff options
| author | Simon Rettberg | 2022-09-09 14:39:56 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2022-09-09 14:39:56 +0200 |
| commit | 499f1a168d30a8ea2238f9c12b2b5cb42c68cdda (patch) | |
| tree | 3227cc8d9dce0cd5c8d403aa5af2b18576a88c1f /core/modules/remote-access | |
| parent | [remote-access] Force usage of modesetting_drv on newer intel chips (diff) | |
| download | mltk-499f1a168d30a8ea2238f9c12b2b5cb42c68cdda.tar.gz mltk-499f1a168d30a8ea2238f9c12b2b5cb42c68cdda.tar.xz mltk-499f1a168d30a8ea2238f9c12b2b5cb42c68cdda.zip | |
[remote-access/xorg] Use OutputClass instead of Device for dynamic stuff
Diffstat (limited to 'core/modules/remote-access')
| -rw-r--r-- | core/modules/remote-access/data/opt/openslx/remote-access/xorg-virtual.conf | 3 | ||||
| -rwxr-xr-x | core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config | 9 |
2 files changed, 2 insertions, 10 deletions
diff --git a/core/modules/remote-access/data/opt/openslx/remote-access/xorg-virtual.conf b/core/modules/remote-access/data/opt/openslx/remote-access/xorg-virtual.conf index 7b5f40cf..a69beddc 100644 --- a/core/modules/remote-access/data/opt/openslx/remote-access/xorg-virtual.conf +++ b/core/modules/remote-access/data/opt/openslx/remote-access/xorg-virtual.conf @@ -1,5 +1,6 @@ -Section "Device" +Section "OutputClass" Identifier "Device0" + MatchDriver "%DRIVER%" Driver "%DRIVER%" Option "VirtualHeads" "1" Option "ModeValidation" "AllowNonEdidModes" diff --git a/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config b/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config index dc28aa5a..ffa7caf2 100755 --- a/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config +++ b/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config @@ -4,15 +4,6 @@ [ -n "$SLX_REMOTE_VNC" ] || exit 0 # Nothing to do -# Force modesetting driver on newer intel models -vendor="$( < /proc/cpuinfo sed 's/\s//g' | awk -F: '$1 == "vendor_id" {print $2; exit}' )" -cpufamily="$( < /proc/cpuinfo sed 's/\s//g' | awk -F: '$1 == "cpufamily" {print $2; exit}' )" -model="$( < /proc/cpuinfo sed 's/\s//g' | awk -F: '$1 == "model" {print $2; exit}' )" - -if [ "$vendor" = "GenuineIntel" ] && [ "$cpufamily" -eq 6 ] && [ "$model" -gt 60 ]; then - rm -- "/usr/lib/xorg/modules/drivers/intel_drv.so" -fi - # Disable all input drivers cp "/opt/openslx/remote-access/xorg-noinput.conf" "/etc/X11/xorg.conf.d/16-remote-access-noinput.conf" |