frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

This commit is contained in:
Daniel Stone 2006-08-12 18:58:18 +03:00 committed by Daniel Stone
parent 008aa7eb6e c4951e0a6b
commit 26c3cd1c9e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/common/xf86Mode.c
View File

@ -1758,7 +1758,8 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
* horizontal timing parameters that CRTs may have * horizontal timing parameters that CRTs may have
* problems with. * problems with.
*/ */
if ((q->type & M_T_DEFAULT) && if (!scrp->monitor->reducedblanking &&
(q->type & M_T_DEFAULT) &&
((double)q->HTotal / (double)q->HDisplay) < 1.15) ((double)q->HTotal / (double)q->HDisplay) < 1.15)
continue; continue;

7
hw/xfree86/common/xf86str.h
View File

@ -119,14 +119,19 @@ typedef enum {
MODE_ERROR = -1 /* error condition */ MODE_ERROR = -1 /* error condition */
} ModeStatus; } 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_BUILTIN 0x01 /* built-in mode */
# define M_T_CLOCK_C (0x02 | M_T_BUILTIN) /* built-in mode - configure clock */ # 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_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) # define M_T_CLOCK_CRTC_C (M_T_CLOCK_C | M_T_CRTC_C)
/* built-in mode - configure CRTC and clock */ /* 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_DEFAULT 0x10 /* (VESA) default modes */
# define M_T_USERDEF 0x20 /* One of the modes from the config file */ # 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 */ /* Video mode */
typedef struct _DisplayModeRec { typedef struct _DisplayModeRec {