Removed savagedma.[ch]. They have been unused for a while and were only

kept around for reference. Now that command DMA is implemented in the
DRM module they are no longer needed.

diff --git a/src/mesa/drivers/dri/savage/savagedma.c b/src/mesa/drivers/dri/savage/savagedma.c
deleted file mode 100644 (file)
index 51a1e6d..0000000
--- a/src/mesa/drivers/dri/savage/savagedma.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <X11/Xlibint.h>
-#include <stdio.h>
-#include "savageioctl.h"
-#include "savagedma.h"
-#include "savage_bci.h"
-#include <time.h>
-#include <unistd.h>
-
-#if 0
-/* flag =
-         0  return -1 if no available page
-        1  wait until a page be available */
-static GLuint getDMAPage (savageContextPtr imesa, int flag) {
-    DMABufferPtr dmaBuff = &imesa->DMABuf;
-    GLuint page;
-    GLuint eventTag1;
-
-    if (dmaBuff->kickFlag == GL_FALSE)
-       return dmaBuff->usingPage;
-
-    page = dmaBuff->usingPage + 1;
-
-    /* overflow */
-    if (page >= (dmaBuff->buf->size * dmaBuff->buf->type)/DMA_PAGE_SIZE)
-       page = 0;
-
-    eventTag1 = GET_EVENTTAG;
-    if ( eventTag1 == page) { /* is kicking off */
-       if (flag == 1)
-           while (GET_EVENTTAG == page); /* FIXME: add a max loop count? */
-       else
-           return -1;
-    }
-
-    /* ok, that's it */
-    dmaBuff->usingPage = page;
-    dmaBuff->start = dmaBuff->end = dmaBuff->allocEnd =
-       (dmaBuff->buf->linear + DMA_PAGE_SIZE * page);
-    dmaBuff->kickFlag = GL_FALSE;
-
-    return page;
-}
-
-/* Allocate space in a real DMA buffer */
-void *savageDMAAlloc (savageContextPtr imesa, GLuint size) {
-    DMABufferPtr dmaBuff = &imesa->DMABuf;
-
-    /* make sure that everything has been filled in and committed */
-    assert (dmaBuff->end == dmaBuff->allocEnd);
-
-    size *= sizeof (u_int32_t); /* size in bytes */
-    if (dmaBuff->kickFlag == GL_TRUE) {
-       if (size > DMA_PAGE_SIZE)
-           return NULL;
-       getDMAPage (imesa, 1);
-    } else if (dmaBuff->end + size >=
-              dmaBuff->buf->linear + DMA_PAGE_SIZE*(dmaBuff->usingPage+1)) {
-       /* need kick off */
-       savageDMAFlush (imesa);
-       getDMAPage (imesa, 1);
-    }
-    dmaBuff->allocEnd = dmaBuff->end + size;
-    return (void *)dmaBuff->end;
-}
-
-/* Flush DMA buffer via DMA */
-void savageDMAFlush (savageContextPtr imesa) {
-    volatile u_int32_t* BCIbase;
-    DMABufferPtr dmaBuff = &imesa->DMABuf;
-    u_int32_t phyAddress;
-    GLuint dmaCount, dmaCount1, remain;
-    int i;
-
-    /* make sure that everything has been filled in and committed */
-    assert (dmaBuff->allocEnd == dmaBuff->end);
-
-    if (dmaBuff->kickFlag == GL_TRUE) /* has been kicked off? */
-      return;
-    if (dmaBuff->start == dmaBuff->end) /* no command? */
-      return;
-
-    /* get bci base */
-    BCIbase = (volatile u_int32_t *)SAVAGE_GET_BCI_POINTER(imesa,4);
-
-    /* set the eventtag */
-    *BCIbase = (dmaBuff->usingPage & 0xffffL) | (CMD_UpdateShadowStat << 27)
-       | (1 << 22);
-    *BCIbase = 0x96010051;  /* set register x51*/
-    /* set the DMA buffer address */
-    phyAddress = (dmaBuff->buf->phyaddress + dmaBuff->usingPage*DMA_PAGE_SIZE)
-       & MDT_SRCADD_ALIGMENT;
-    if (dmaBuff->buf->location == DRM_SAVAGE_MEM_LOCATION_AGP)
-       *BCIbase = (phyAddress) | MDT_SRC_AGP;
-    else
-        *BCIbase = (phyAddress) | MDT_SRC_PCI;
-
-    /* pad with noops to multiple of 32 bytes */
-    dmaCount = (GLuint)(dmaBuff->end - dmaBuff->start);
-    dmaCount1 = (dmaCount + 31UL) & ~31UL;
-    remain = (dmaCount1 - dmaCount) >> 2;
-    for (i = 0; i < remain; i++) {
-        *((u_int32_t *)dmaBuff->end) = 0x40000000L;
-        dmaBuff->end+=4;
-    }
-    dmaCount = (dmaCount1 >> 3) - 1;
-    dmaBuff->allocEnd = dmaBuff->end;
-
-    /* kick off */
-    *BCIbase = (0xA8000000L)|dmaCount;
-    dmaBuff->kickFlag = GL_TRUE;
-}
-
-/* Init real DMA */
-int savageDMAInit (savageContextPtr imesa)
-{
-    DMABufferPtr dmaBuff = &imesa->DMABuf;
-    drm_savage_alloc_cont_mem_t * req;
-    int i;
-    long ret;
-
-    req = (drm_savage_alloc_cont_mem_t *)
-       malloc (sizeof(drm_savage_alloc_cont_mem_t));
-    if (!req)
-       return GL_FALSE;
-
-    req->type = DRM_SAVAGE_MEM_PAGE;
-    req->linear = 0;
-
-    /* try agp first */
-    req->phyaddress = imesa->sarea->agp_offset;
-    if (req->phyaddress) {
-       if (drmMap (imesa->driFd,
-                   req->phyaddress,
-                   DRM_SAVAGE_DMA_AGP_SIZE,
-                   (drmAddressPtr)&req->linear) < 0) {
-           fprintf (stderr, "AGP map error.\n");
-           goto dma;
-       }
-       if (0) fprintf (stderr,"Using AGP dma|\n");
-       req->location = DRM_SAVAGE_MEM_LOCATION_AGP;
-       req->size = DRM_SAVAGE_DMA_AGP_SIZE/DRM_SAVAGE_MEM_PAGE;
-    }
-
-  dma:
-    if (!req->linear) {
-       req->size = DMA_BUFFER_SIZE/DRM_SAVAGE_MEM_PAGE;
-       for (i = 0; i < DMA_TRY_COUNT; i++) {
-           if ((ret = savageAllocDMABuffer (imesa, req)) != 0)
-               break;
-           req->size = req->size/2;
-       }
-      
-       if (ret <= 0) {
-           fprintf(stderr, "Can't alloc DMA memory(system and agp)\n");
-           return GL_FALSE;
-       }
-       req->location = DRM_SAVAGE_MEM_LOCATION_PCI;
-    }
-
-    dmaBuff->buf = req;
-
-    dmaBuff->start = dmaBuff->end = dmaBuff->allocEnd = req->linear;
-    dmaBuff->usingPage = 0;
-    dmaBuff->kickFlag = GL_FALSE;
-
-    return GL_TRUE;
-}
-
-/* Close real DMA */
-int savageDMAClose (savageContextPtr imesa)
-{
-    DMABufferPtr dmaBuff = &imesa->DMABuf;
-    drm_savage_alloc_cont_mem_t * req = dmaBuff->buf;
-
-    if(req->location == DRM_SAVAGE_MEM_LOCATION_PCI)
-       savageFreeDMABuffer (imesa, req);
-    else { /* AGP memory */
-       drmUnmap ((drmAddress)req->linear, req->size*req->type);
-       drmRmMap (imesa->driFd, req->phyaddress);
-    }
-    free (req);
-
-    return GL_TRUE;
-}
-#endif

diff --git a/src/mesa/drivers/dri/savage/savagedma.h b/src/mesa/drivers/dri/savage/savagedma.h
deleted file mode 100644 (file)
index 09f0c46..0000000
--- a/src/mesa/drivers/dri/savage/savagedma.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef SAVAGEDMA
-#define SAVAGEDMA
-
-/* Whether use DMA to transfer the 3d commands and data */
-/* Need to fix the drm driver first though */
-#define SAVAGE_CMD_DMA 0
-
-#define DMA_BUFFER_SIZE (4*1024*1024) /*4M*/
-#define MAX_DMA_BUFFER_SIZE (16*1024*1024)
-#define DMA_PAGE_SIZE (4*1024)  /* savage4 , twister, prosavage,...*/
-#define DMA_TRY_COUNT 4
-
-#define MAX_SHADOWCOUNTER (MAX_DMA_BUFFER_SIZE / DMA_PAGE_SIZE)
-typedef struct DMABuffer{
-    drm_savage_alloc_cont_mem_t * buf;
-    GLuint start, end, allocEnd;
-    GLuint usingPage; /*current page */
-    unsigned int kickFlag; /* usingPage is kicked off ?*/
-} DMABuffer_t, * DMABufferPtr;
-
-void *savageDMAAlloc (savageContextPtr imesa, GLuint size);
-void savageDMACommit (savageContextPtr imesa, void *end);
-void savageDMAFlush (savageContextPtr imesa);
-int savageDMAInit (savageContextPtr imesa);
-int savageDMAClose (savageContextPtr);
-
-#endif