diff options
| author | jhartmann <jhartmann> | 2000-02-12 18:12:11 +0000 |
|---|---|---|
| committer | jhartmann <jhartmann> | 2000-02-12 18:12:11 +0000 |
| commit | 21f44c8dd52a98e5974491c2a7b2004ebc779f98 (patch) | |
| tree | 5109c1612ec022158a011c2b7e3a71725ada227c | |
| parent | 111d3661c49bbfb7b5f2fc249e3b82825a20e69d (diff) | |
Dma updates for keith
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c | 8 | ||||
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c index 6ba277359..cb6f56e17 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c @@ -645,10 +645,10 @@ void MGALostContext(ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; MGAPtr pMga = MGAPTR(pScrn); /* MGAFBLayout *pLayout = &pMga->CurrentLayout; */ - - ErrorF("Syncing : lost\n"); - MGABUSYWAIT(); - ErrorF("Syncing done\n"); + +/* This will eventually have to figure out if the + * dma engine needs to sync to get things going again + */ } static void diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c index cffbfa763..9367a3003 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c @@ -449,11 +449,8 @@ MGAStormSync(ScrnInfoPtr pScrn) { MGAPtr pMga = MGAPTR(pScrn); -# ifndef XF86DRI while(MGAISBUSY()); -# else - MGABUSYWAIT(); -# endif + /* flush cache before a read (mga-1064g 5.1.6) */ OUTREG8(MGAREG_CRTC_INDEX, 0); if(pMga->AccelFlags & CLIPPER_ON) { |