diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c b/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c index ae7257e00..bb0df1af5 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c @@ -24,7 +24,7 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen <jpaana@s2.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.6 2000/02/10 18:59:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.7 2000/11/03 18:46:12 eich Exp $ */ #include "nv_include.h" @@ -32,26 +32,6 @@ #include "nvvga.h" /* - * Lock and unlock VGA and SVGA registers. - */ -void RivaEnterLeave(ScrnInfoPtr pScrn, Bool enter) -{ - vgaHWPtr hwp = VGAHWPTR(pScrn); - NVPtr pNv = NVPTR(pScrn); - - if (enter) - { - vgaHWUnlock(hwp); - pNv->riva.LockUnlock(&pNv->riva, 0); - } - else - { - pNv->riva.LockUnlock(&pNv->riva, 1); - vgaHWLock(hwp); - } -} - -/* * Override VGA I/O routines. */ static void NVWriteCrtc(vgaHWPtr pVga, CARD8 index, CARD8 value) @@ -279,7 +259,8 @@ NVCommonSetup(ScrnInfoPtr pScrn) pNv->Dac.maxPixelClock = pNv->riva.MaxVClockFreqKHz; - RivaEnterLeave(pScrn, TRUE); + vgaHWUnlock(VGAHWPTR(pScrn)); + pNv->riva.LockUnlock(&pNv->riva, 0); } void |