xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/modes/xf86EdidModes.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b2f9ce201cc2a14d5d6ad055b46c9317b040ec2e
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jul 27 17:34:36 2010 -0400

    edid: Fix the HDTV sync pulse adjustment
    
    Simple typo, should have been adjusting the horizontal timings
    consistently since we're not trying to mangle vertical at all.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Patrick E. Kane <pekane52 at gmail.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index c367749..3d51b1d 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -484,8 +484,8 @@ DDCModesFromStandardTiming(struct std_timings *timing, ddc_quirk_t quirks,
 	     (hsize == 1368 && vsize == 769))) {
 	    Mode = xf86CVTMode(1366, 768, 60, FALSE, FALSE);
 	    Mode->HDisplay = 1366;
-	    Mode->VSyncStart--;
-	    Mode->VSyncEnd--;
+	    Mode->HSyncStart--;
+	    Mode->HSyncEnd--;
 	} else if (hsize && vsize && refresh) {
 	    Mode = FindDMTMode(hsize, vsize, refresh, rb);