diff options
| author | Simon Farnsworth <simon.farnsworth@onelan.com> | 2010-05-20 09:58:37 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-05-20 09:15:41 -0700 |
| commit | cfc629148891be317ba60f2495abcda485780191 (patch) | |
| tree | cff20dd9c3ee02fc2bb21821da4e3bab6200ac1e | |
| parent | a1c2bdb6ab7a4f374844f80e83620b155991e817 (diff) | |
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@onelan.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index ef7ed58b9..8b9ec4149 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; |