xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86Mode.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree c4951e0a6b6cf3eeee710cc5cda1d9bc929ee3d7 (from e1921f014b102e3eecf3b41972f8672cf23264d6)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Thu Aug 10 20:49:06 2006 -0400

    Fix a mode sanity check to not break reduced-blanking setups (LCDs).

diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index b892e3e..72dd1ca 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -1758,7 +1758,8 @@ xf86ValidateModes(ScrnInfoPtr scrp, Disp
 			 * horizontal timing parameters that CRTs may have
 			 * 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)
 			    continue;