summaryrefslogtreecommitdiff
path: root/package/x11r7/xserver_xorg-server
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2012-07-28 00:17:32 +1000
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-07-30 21:18:12 +0200
commitb8b98bd1b055395922860ad3f4e69ac48ece97d9 (patch)
treecbe20cdf71d8872af962b59fefe3f46cfa4228a9 /package/x11r7/xserver_xorg-server
parent29afecace95d0687477bf42f7ce4e918bcd0f271 (diff)
xorg-xserver: always enable forced outputs
If the user has gone to the effort of manually enabling an output in the configuration file assume that they know what they're doing. X.org Bug 14611 <http://bugs.freedesktop.org/show_bug.cgi?id=14611> Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/x11r7/xserver_xorg-server')
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch
new file mode 100644
index 000000000..bf279775f
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch
@@ -0,0 +1,30 @@
+From 93ff1bc5884cdfca1132af7fbc06c48e06f218c8 Mon Sep 17 00:00:00 2001
+From: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
+Date: Mon, 15 Feb 2010 12:18:00 +0000
+Subject: Always enable outputs that have been forced on in the configuration file
+
+If the user has gone to the effort of manually enabling an output in
+the configuration file assume that they know what they're doing.
+
+X.org Bug 14611 <http://bugs.freedesktop.org/show_bug.cgi?id=14611>
+
+Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
+Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+---
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index 573fe96..9b1ff28 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -1573,7 +1573,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+ */
+ output->status = (*output->funcs->detect)(output);
+
+- if (output->status == XF86OutputStatusDisconnected)
++ if (output->status == XF86OutputStatusDisconnected &&
++ !xf86ReturnOptValBool(output->options, OPTION_ENABLE, FALSE))
+ {
+ xf86OutputSetEDID (output, NULL);
+ continue;
+--
+cgit v0.9.0.2-2-gbebe