[PATCH] Always enable outputs that have been forced on in the configuration file

[Pauli Nieminen]

From: Simon Farnsworth <simon.farnsworth at onelan.co.uk>

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 at onelan.co.uk>
---

I'm just forwarding this patch from the bug report after testing it
with xserver 1.6. I didn't test with any newer server because of 
a lot of missing build dependencies.

Use cases for this patch are:
1. Broken display devices that can't be detected.
2. Display devices that take longer to be ready than boot time is.
3. To start xserver in headless computer.

For me this fixes the case 3. I want to run headless computer remotely
for testing mesa.

 hw/xfree86/modes/xf86Crtc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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;
-- 
1.6.3.3