diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:36 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:36 +0000 |
commit | 6f120b17b307e3825015336c09eb0a5c3c7a5cbf (patch) | |
tree | ce1753ead5693cb8f228f75cfda37ec33b0a5e01 | |
parent | e5475fea5066595512bd844dde818222095be3bf (diff) |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
-rw-r--r-- | src/gfx/disp_gu1.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gfx/disp_gu1.c b/src/gfx/disp_gu1.c index b177264..858ae9a 100644 --- a/src/gfx/disp_gu1.c +++ b/src/gfx/disp_gu1.c @@ -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 @@ gu1_video_shutdown(void) 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); |