diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c index a8cffc976..0d09b79dd 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c @@ -27,7 +27,10 @@ void TDFXSendNOPPrivate3D(ScrnInfoPtr pScrn) { TDFXPtr pTDFX; - if (!pTDFX->syncDone) return TDFXFirstSync(pScrn); + if (!pTDFX->syncDone) { + TDFXFirstSync(pScrn); + return; + } pTDFX=TDFXPTR(pScrn); TDFXAllocateSlots(pTDFX, 2); SET_3DPK4_HEADER(1, 0x48<<3); @@ -114,7 +117,7 @@ void TDFXResetFifo(ScrnInfoPtr pScrn) !!! We should use expedential backoff in our reads !!! */ -void TDFXSyncFifo(ScrnInfoPtr pScrn) +static void TDFXSyncFifo(ScrnInfoPtr pScrn) { TDFXPtr pTDFX; int i, cnt; @@ -237,7 +240,8 @@ void TDFXSwapContextPrivate(ScreenPtr pScreen) pTDFX->fifoSlots = pTDFX->fifoEnd-pTDFX->fifoPtr-8; } -void TDFXLostContext(ScreenPtr pScreen) { +void TDFXLostContext(ScreenPtr pScreen) +{ ScrnInfoPtr pScrn; TDFXPtr pTDFX; TDFXSAREAPriv *sPriv; @@ -323,7 +327,8 @@ TDFXMakeSpace(TDFXPtr pTDFX, uint32 slots) } void -TDFXAllocateSlots(TDFXPtr pTDFX, int slots) { +TDFXAllocateSlots(TDFXPtr pTDFX, int slots) +{ #ifdef TDFX_DEBUG_FIFO if (pTDFX->fifoEnd-pTDFX->fifoPtr<pTDFX->fifoSlots) ErrorF("FIFO overrun\n"); |