diff options
| author | Ian Romanick <idr@umwelt.(none)> | 2006-08-25 09:34:21 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@umwelt.(none)> | 2006-08-25 09:34:21 -0700 |
| commit | 21291d6ca7188e5733ed0c93215ee0f1f0f90cc9 (patch) | |
| tree | 164ae681be0cfee5fc239a999e296547d3343312 /hw/xfree86/common/xf86str.h | |
| parent | 1a5561c4ecccaf32b03c41373adf376100d457aa (diff) | |
| parent | cd2da4e41eae233b50f8830d9a8f5d1d916a5a1b (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Diffstat (limited to 'hw/xfree86/common/xf86str.h')
| -rw-r--r-- | hw/xfree86/common/xf86str.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h index 0dc176e04..1c78bd341 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -129,14 +129,19 @@ typedef enum { MODE_ERROR = -1 /* error condition */ } ModeStatus; +/* + * The mode sets are, from best to worst: USERDEF, DRIVER, and DEFAULT/BUILTIN. + * Preferred will bubble a mode to the top within a set. + */ # define M_T_BUILTIN 0x01 /* built-in mode */ # define M_T_CLOCK_C (0x02 | M_T_BUILTIN) /* built-in mode - configure clock */ # define M_T_CRTC_C (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC */ # define M_T_CLOCK_CRTC_C (M_T_CLOCK_C | M_T_CRTC_C) /* built-in mode - configure CRTC and clock */ +# define M_T_PREFERRED 0x08 /* preferred mode within a set */ # define M_T_DEFAULT 0x10 /* (VESA) default modes */ # define M_T_USERDEF 0x20 /* One of the modes from the config file */ -# define M_T_EDID 0x40 /* Mode from the EDID info from the monitor */ +# define M_T_DRIVER 0x40 /* Supplied by the driver (EDID, etc) */ /* Video mode */ typedef struct _DisplayModeRec { |