xserver: Branch 'master'

[Eric Anholt]

 hw/xfree86/common/xf86Mode.c |    5 +++++
 1 files changed, 5 insertions(+)

New commits:
diff-tree 8bce182568f14edfb03911d8c5d791fd83bb6222 (from 31f2d4a57e04f5ea635fbb50c508405c4fc37b65)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jan 29 17:30:59 2007 -0800

    Restore a few important lines killed in the previous commit.
    
    Typical results were failure to sync, and a black screen.

diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 7f5ae36..d5085b5 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -725,6 +725,11 @@ xf86SetModeCrtc(DisplayModePtr p, int ad
         p->CrtcVSyncEnd         *= p->VScan;
         p->CrtcVTotal           *= p->VScan;
     }
+    p->CrtcVBlankStart = min(p->CrtcVSyncStart, p->CrtcVDisplay);
+    p->CrtcVBlankEnd = max(p->CrtcVSyncEnd, p->CrtcVTotal);
+    p->CrtcHBlankStart = min(p->CrtcHSyncStart, p->CrtcHDisplay);
+    p->CrtcHBlankEnd = max(p->CrtcHSyncEnd, p->CrtcHTotal);
+
     p->CrtcHAdjusted = FALSE;
     p->CrtcVAdjusted = FALSE;
 }