diff options
| author | Simon Farnsworth <simon.farnsworth@onelan.co.uk> | 2010-02-15 14:18:00 +0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-02-22 13:28:40 -0800 |
| commit | 93ff1bc5884cdfca1132af7fbc06c48e06f218c8 (patch) | |
| tree | 72ea1374f3c7ab84adf25221ab85275adde4ee37 | |
| parent | ca9c2472d74c7107ccc117e2c9c723c168d2eccf (diff) | |
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>
| -rw-r--r-- | 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 573fe96cb..9b1ff280b 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; |