diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c b/xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c index 9726b8219..9649216b3 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.45 2000/08/04 16:13:37 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.46 2000/11/03 18:46:15 eich Exp $ */ /* * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved. * @@ -776,10 +776,6 @@ GenericEnterGraphics(ScreenPtr pScreen, ScrnInfoPtr pScreenInfo) { vgaHWPtr pvgaHW = VGAHWPTR(pScreenInfo); - /* Map VGA aperture */ - if (!vgaHWMapMem(pScreenInfo)) - return FALSE; - /* Unlock VGA registers */ vgaHWUnlock(pvgaHW); @@ -804,7 +800,6 @@ GenericLeaveGraphics(ScrnInfoPtr pScreenInfo) { GenericRestore(pScreenInfo); vgaHWLock(VGAHWPTR(pScreenInfo)); - vgaHWUnmapMem(pScreenInfo); } @@ -829,6 +824,7 @@ GenericCloseScreen(int scrnIndex, ScreenPtr pScreen) GenericLeaveGraphics(pScreenInfo); pScreenInfo->vtSema = FALSE; } + vgaHWUnmapMem(pScreenInfo); return Closed; } @@ -1066,6 +1062,9 @@ GenericScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* Get driver private */ pGenericPriv = GenericGetRec(pScreenInfo); + /* Map VGA aperture */ + if (!vgaHWMapMem(pScreenInfo)) + return FALSE; /* Initialise graphics mode */ if (!GenericEnterGraphics(pScreen, pScreenInfo)) |