diff options
Diffstat (limited to 'src/mesa/drivers/dri/unichrome/server/via_dri.c')
| -rw-r--r-- | src/mesa/drivers/dri/unichrome/server/via_dri.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/unichrome/server/via_dri.c b/src/mesa/drivers/dri/unichrome/server/via_dri.c index 2d69c4d7a4..a7a171cda9 100644 --- a/src/mesa/drivers/dri/unichrome/server/via_dri.c +++ b/src/mesa/drivers/dri/unichrome/server/via_dri.c @@ -126,18 +126,11 @@ static void VIADRIIrqExit( DRIDriverContext *ctx ) { } } - -/* Locks up engine - FIXME -#define ENABLE_AGP_RINGBUF -*/ - -#ifdef ENABLE_AGP_RINGBUF - static void VIADRIRingBufferCleanup(DRIDriverContext *ctx) { VIAPtr pVia = VIAPTR(ctx); VIADRIPtr pVIADRI = pVia->devPrivate; - drmVIADMAInit ringBufInit; + drm_via_dma_init_t ringBufInit; if (pVIADRI->ringBufActive) { xf86DrvMsg(pScreen->myNum, X_INFO, @@ -156,7 +149,7 @@ static int VIADRIRingBufferInit(DRIDriverContext *ctx) { VIAPtr pVia = VIAPTR(ctx); VIADRIPtr pVIADRI = pVia->devPrivate; - drmVIADMAInit ringBufInit; + drm_via_dma_init_t ringBufInit; drmVersionPtr drmVer; pVIADRI->ringBufActive = 0; @@ -199,9 +192,6 @@ static int VIADRIRingBufferInit(DRIDriverContext *ctx) return GL_TRUE; } -#endif - - static int VIADRIAgpInit(const DRIDriverContext *ctx, VIAPtr pVia) { unsigned long agp_phys; @@ -456,9 +446,7 @@ VIADRICloseScreen(DRIDriverContext * ctx) VIAPtr pVia = VIAPTR(ctx); VIADRIPtr pVIADRI=(VIADRIPtr)pVia->devPrivate; -#ifdef ENABLE_AGP_RINGBUF VIADRIRingBufferCleanup(ctx); -#endif if (pVia->MapBase) { xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Unmapping MMIO registers\n"); @@ -527,10 +515,8 @@ VIADRIFinishScreenInit(DRIDriverContext * ctx) #endif VIADRIIrqInit(ctx); -#ifdef ENABLE_AGP_RINGBUF pVIADRI->ringBufActive = 0; VIADRIRingBufferInit(ctx); -#endif return GL_TRUE; } |