From b67f9f5c875efaa41bded7ed2f38b2a5fbd17597 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat, 4 Jun 2005 20:26:28 +0000
Subject: Sync with 6.8.2 branch: Bug #591    
 (https://bugs.freedesktop.org/show_bug.cgi?id=591) attachment #308    
 (https://bugs.freedesktop.org/attachment.cgi?id=308): Fix video timing    
 problems with Sony PCG-C1VN Vaio Picturebook notebook && co. Patch by    
 Marc Aurele La France

---
 src/atipreinit.c |  5 +++--
 src/ativga.c     | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/atipreinit.c b/src/atipreinit.c
index 4327efb1..ae9b64ba 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -1,4 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.74 2003/12/22 17:48:09 tsi Exp $ */
+/* $XdotOrg: $ */
 /*
  * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -1937,11 +1938,11 @@ ATIPreInit
                    VBlankEnd += 0x0100U;
 
                 pATI->LCDHBlankWidth = HBlankEnd - HBlankStart;
-                pATI->LCDHSyncStart = HSyncStart - HBlankStart - 1;
+                pATI->LCDHSyncStart = HSyncStart - HBlankStart;
                 pATI->LCDHSyncWidth = HSyncEnd - HSyncStart;
 
                 pATI->LCDVBlankWidth = VBlankEnd - VBlankStart;
-                pATI->LCDVSyncStart = VSyncStart - VBlankStart - 1;
+                pATI->LCDVSyncStart = VSyncStart - VBlankStart;
                 pATI->LCDVSyncWidth = VSyncEnd - VSyncStart;
 
                 HDisplay = HTotal + 5 - pATI->LCDHBlankWidth;
diff --git a/src/ativga.c b/src/ativga.c
index 8d5c5bb2..e75d4dcd 100644
--- a/src/ativga.c
+++ b/src/ativga.c
@@ -1,4 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c,v 1.20 2003/04/23 21:51:31 tsi Exp $ */
+/* $XdotOrg: $ */
 /*
  * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -185,7 +186,11 @@ ATIVGACalculate
             (pATI->Chip >= ATI_CHIP_264CT))
             pMode->CrtcHBlankStart--;
         pMode->CrtcHSyncStart = pMode->HSyncStart >> 3;
+        if (pATI->LCDPanelID >= 0)
+            pMode->CrtcHSyncStart--;
         pMode->CrtcHSyncEnd = pMode->HSyncEnd >> 3;
+        if (pATI->LCDPanelID >= 0)
+            pMode->CrtcHSyncEnd--;
         pMode->CrtcHBlankEnd = (pMode->HTotal >> 3) - 1;
         pMode->CrtcHTotal = (pMode->HTotal >> 3) - 5;
         pMode->CrtcHSkew = pMode->HSkew;
@@ -327,6 +332,11 @@ ATIVGACalculate
         pMode->CrtcVBlankStart++;
     else
         pMode->CrtcVBlankStart--;
+    if (pATI->LCDPanelID >= 0)
+    {
+        pMode->CrtcVSyncStart--;
+        pMode->CrtcVSyncEnd--;
+    }
     pMode->CrtcVBlankEnd--;
     if (pATI->Chip < ATI_CHIP_264CT)
         pMode->CrtcVBlankEnd--;
-- 
cgit v1.2.3