xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xfree86/doc/man/xorg.conf.man.pre |    8 ++++++++
 hw/xfree86/modes/xf86Crtc.c          |    4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit ebd745ced89b2a2d9f6b4dcbd9f5f7e7f3b35451
Author: Simon Farnsworth <simon.farnsworth at onelan.com>
Date:   Thu May 20 09:58:38 2010 +0100

    Add documentation for the new DefaultModes option
    
    This patch adds documentation for the DefaultModes monitor option
    added in the previous patch.
    
    Signed-off-by: Simon Farnsworth <simon.farnsworth at onelan.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index f7ff6f6..5ff4ff2 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -1654,6 +1654,14 @@ at startup.  By default, the server will attempt to enable all connected
 monitors.
 (RandR 1.2-supporting drivers only)
 .TP 7
+.BI "Option " "\*qDefaultModes\*q  " \*qbool\*q
+This optional entry specifies whether the server should add supported default
+modes to the list of modes offered on this monitor. By default, the server
+will add default modes; you should only disable this if you can guarantee
+that EDID will be available at all times, or if you have added custom modelines
+which the server can use.
+(RandR 1.2-supporting drivers only)
+.TP 7
 .BI "Option " "\*qMinClock\*q  " \*qfrequency\*q
 This optional entry specifies the minimum dot clock, in kHz, that is supported
 by the monitor.
commit cfc629148891be317ba60f2495abcda485780191
Author: Simon Farnsworth <simon.farnsworth at onelan.com>
Date:   Thu May 20 09:58:37 2010 +0100

    Add configuration option to disable default modes on an output
    
    Setting 'Option "DefaultModes" "No"' in an output will guarantee that
    X will omit the default modes, just picking up modes from the
    configuration file and modes provided by the output.
    
    Signed-off-by: Simon Farnsworth <simon.farnsworth at onelan.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index ef7ed58..8b9ec41 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -439,6 +439,7 @@ typedef enum {
     OPTION_ROTATE,
     OPTION_PANNING,
     OPTION_PRIMARY,
+    OPTION_DEFAULT_MODES,
 } OutputOpts;
 
 static OptionInfoRec xf86OutputOptions[] = {
@@ -456,6 +457,7 @@ static OptionInfoRec xf86OutputOptions[] = {
     {OPTION_ROTATE,	    "Rotate",		OPTV_STRING,  {0}, FALSE },
     {OPTION_PANNING,	    "Panning",		OPTV_STRING,  {0}, FALSE },
     {OPTION_PRIMARY,	    "Primary",		OPTV_BOOLEAN, {0}, FALSE },
+    {OPTION_DEFAULT_MODES,  "DefaultModes",	OPTV_BOOLEAN, {0}, FALSE },
     {-1,		    NULL,		OPTV_NONE,    {0}, FALSE },
 };
 
@@ -1560,7 +1562,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 	int		    min_clock = 0;
 	int		    max_clock = 0;
 	double		    clock;
-	Bool                add_default_modes = TRUE;
+	Bool		    add_default_modes = xf86ReturnOptValBool(output->options, OPTION_DEFAULT_MODES, TRUE);
 	Bool		    debug_modes = config->debug_modes ||
 					  xf86Initialising;
 	enum det_monrec_source sync_source = sync_default;