Commit b8b98bd1 authored by Jonathan Liu's avatar Jonathan Liu Committed by Thomas Petazzoni
Browse files

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: default avatarJonathan Liu <net147@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 29afecac

package/x11r7/xserver_xorg-server/xserver_xorg-server-03-always-enable-forced-outputs.patch

0 → 100644
+30 −0
Original line number Diff line number Diff line 
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