summaryrefslogtreecommitdiff
path: root/src/aticonsole.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:59 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:59 +0000
commit2eab4a4e2b8f2ec2154738f0dd57cf0dc5c7816a (patch)
treeadd0e49232de50548191a4243ed0d32cc91d1ec5 /src/aticonsole.c
parent770358c0804c3e919440d2575e4ef25365f763b6 (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src/aticonsole.c')
-rw-r--r--src/aticonsole.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/aticonsole.c b/src/aticonsole.c
index cdd91f4..5fe9102 100644
--- a/src/aticonsole.c
+++ b/src/aticonsole.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c,v 1.20 2003/01/01 19:16:31 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c,v 1.22 2003/11/13 18:42:47 tsi Exp $ */
/*
* Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
*
@@ -24,6 +24,7 @@
#include "atiadapter.h"
#include "aticonsole.h"
#include "aticrtc.h"
+#include "atii2c.h"
#include "atilock.h"
#include "atimach64.h"
#include "atimode.h"
@@ -335,6 +336,9 @@ ATIFreeScreen
ScrnInfoPtr pScreenInfo = xf86Screens[iScreen];
ATIPtr pATI = ATIPTR(pScreenInfo);
+ if (pATI->Closeable || (serverGeneration > 1))
+ ATII2CFreeScreen(iScreen);
+
if (pATI->Closeable)
(void)(*pScreen->CloseScreen)(iScreen, pScreen);