[Xorg-commit] xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx disp_gu1.c,1.1,1.1.4.1

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/drivers/nsc/gfx

Modified Files:
      Tag: XORG-CURRENT
	disp_gu1.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: disp_gu1.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/disp_gu1.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/disp_gu1.c	14 Nov 2003 16:48:55 -0000	1.1
+++ b/disp_gu1.c	23 Feb 2004 21:35:36 -0000	1.1.4.1
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/disp_gu1.c,v 1.4 2003/02/06 17:46:02 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/disp_gu1.c,v 1.5 2004/01/27 17:31:59 dawes Exp $ */
 /*
  * $Workfile: disp_gu1.c $
  *
@@ -410,6 +410,9 @@
 
    gfx_reset_video();
 
+   /* Cyrix Corporation 5530 Video [Kahlua] rev 0 needs some more time */
+   gfx_delay_milliseconds(1);
+
    /* UNLOCK THE DISPLAY CONTROLLER REGISTERS */
 
    unlock = READ_REG32(DC_UNLOCK);