build fixes and enable agp dma

diff --git a/src/mesa/drivers/dri/unichrome/server/via_dri.c b/src/mesa/drivers/dri/unichrome/server/via_dri.c
index 2d69c4d7a4cf45b232f158971ca83301cf683cc4..a7a171cda9040743f337dc32e3357ce935ccd021 100644 (file)
--- 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;
 }

diff --git a/src/mesa/drivers/dri/unichrome/server/via_regs.h b/src/mesa/drivers/dri/unichrome/server/via_regs.h
index 8205939106fb93ae1b5b650a729df99c6cc400fb..5c5eecbe831e1e86a1542cad1fa5d4d7cb600a7d 100644 (file)
--- a/src/mesa/drivers/dri/unichrome/server/via_regs.h
+++ b/src/mesa/drivers/dri/unichrome/server/via_regs.h
@@ -36,21 +36,6 @@
 
 /*#define VIA_SERIES(chip)  (chip == VIA_CLE266)*/
 
-
-/* Chip tags.  These are used to group the adapters into
- * related families.
- */
-
-enum VIACHIPTAGS {
-    VIA_UNKNOWN = 0,
-    VIA_CLE266,
-    VIA_KM400,
-    VIA_K8M800,
-    VIA_PM800,
-    VIA_LAST
-};
-
-
 #define PCI_VIA_VENDOR_ID       0x1106
 
 #define PCI_CHIP_CLE3122        0x3122