summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-06-08 11:16:36 +0200
committeranonym <anonym@riseup.net>2016-06-08 11:16:36 +0200
commite216c8cfd1a69a2c3084460ca11c5973a764390b (patch)
treef39ea4a80e4976e5d3858056963e9b6cd87a8dee
parentccf75269f2f6036a581ba6c1c7a191a93ffe6d65 (diff)
parent409e9e026cdc0f8e65c984454d9a0657e027355d (diff)
Merge remote-tracking branch 'origin/bugfix/11500-slow-qxl' into stable
Fix-committed: #11500
-rw-r--r--config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.conf6
-rw-r--r--config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.ids1
2 files changed, 7 insertions, 0 deletions
diff --git a/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.conf b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.conf
new file mode 100644
index 0000000..d5faece
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.conf
@@ -0,0 +1,6 @@
+# Workaround for #11500
+Section "Device"
+ Identifier "qxl"
+ Driver "qxl"
+ Option "ENABLE_SURFACES" "False"
+EndSection
diff --git a/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.ids b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.ids
new file mode 100644
index 0000000..3f0c38e
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.ids
@@ -0,0 +1 @@
+1B360100