From dda79b5ee3eb49f924a3213592d93ba981c99394 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon, 23 Feb 2004 20:35:02 +0000
Subject: Import most of XFree86 4.4RC3. This import excludes files which have
 the     new license. If we want to, later we can import 4.4RC3 again and pick
     up the files that have the new license, but for now the vendor branch    
 is "pure."

---
 src/atimode.c     | 5 ++---
 src/r128_driver.c | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/atimode.c b/src/atimode.c
index 73b6ce7..0aea9fa 100644
--- a/src/atimode.c
+++ b/src/atimode.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.18 2004/01/05 16:42:03 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.19 2004/02/11 17:20:06 tsi Exp $ */
 /*
  * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -125,7 +125,6 @@ ATISwap
     seq4 = GetReg(SEQX, 0x04U);
     gra1 = GetReg(GRAX, 0x01U);
     gra3 = GetReg(GRAX, 0x03U);
-    gra4 = GetReg(GRAX, 0x04U);
     gra5 = GetReg(GRAX, 0x05U);
     gra6 = GetReg(GRAX, 0x06U);
     gra8 = GetReg(GRAX, 0x08U);
@@ -365,7 +364,7 @@ ATIModeSave
 
     int Index;
 
-    /* Get bank to bank 0 */
+    /* Get back to bank 0 */
     (*pATIHW->SetBank)(pATI, 0);
 
 #endif /* AVOID_CPIO */
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 68287a1..f2474d4 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c,v 1.87 2003/11/10 18:41:21 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c,v 1.89 2004/01/29 03:37:16 dawes Exp $ */
 /*
  * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
  *                      Precision Insight, Inc., Cedar Park, Texas, and
@@ -500,7 +500,9 @@ static void R128Unblank(ScrnInfoPtr pScrn)
     if(info->isDFP)
         OUTREGP(R128_FP_GEN_CNTL, 0, ~R128_FP_BLANK_DIS);
     else
-        OUTREGP(R128_CRTC_EXT_CNTL, 0, ~R128_CRTC_DISPLAY_DIS);
+        OUTREGP(R128_CRTC_EXT_CNTL, 0, ~(R128_CRTC_DISPLAY_DIS |
+					 R128_CRTC_VSYNC_DIS |
+					 R128_CRTC_HSYNC_DIS));
 }
 
 /* Compute log base 2 of val. */
-- 
cgit v1.2.3