From 499f1a168d30a8ea2238f9c12b2b5cb42c68cdda Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 9 Sep 2022 14:39:56 +0200
Subject: [remote-access/xorg] Use OutputClass instead of Device for dynamic
 stuff

---
 .../data/opt/openslx/remote-access/xorg-virtual.conf             | 3 ++-
 .../data/opt/openslx/scripts/systemd-remote_x_config             | 9 ---------
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'core/modules/remote-access')

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"
 
-- 
cgit v1.2.3-55-g7522