Completeley rewritten Savage DRM which can be considered secure (modulo

    implementation errors). Direct hardware (MMIO, BCI) access is no longer
    needed in the Mesa driver. Bumped version to 2.0.0. Corresponding
    changes to the DDX and Mesa drivers are being committed.

6 files changed, 26 insertions, 622 deletions

diff --git a/linux-core/Makefile b/linux-core/Makefile
index 05854ea5..1b1bc043 100644
--- a/linux-core/Makefile
+++ b/linux-core/Makefile
@@ -88,6 +88,7 @@ I915SHARED  =   i915_drv.h i915_drm.h i915_irq.c i915_mem.c i915_dma.c
 SISHEADERS=     sis_drv.h sis_drm.h $(DRMHEADERS)
 SISSHARED=      sis_drv.h sis_drm.h sis_ds.c sis_ds.h sis_mm.c
 SAVAGEHEADERS=  savage_drv.h savage_drm.h $(DRMHEADERS)
+SAVAGESHARED=	savage_drv.h savage_drm.h savage_bci.c savage_state.c
 VIAHEADERS =	via_drm.h via_drv.h via_mm.h via_ds.h \
 		via_3d_reg.h $(DRMHEADERS)
 VIASHARED	= via_drm.h via_drv.h via_mm.h via_ds.h \
@@ -100,7 +101,7 @@ FFBHEADERS = 	ffb_drv.h $(DRMHEADERS)
 
 SHAREDSRC = $(DRMSHARED) $(MGASHARED) $(R128SHARED) $(RADEONSHARED) \
 	$(SISSHARED) $(TDFXSHARED) $(VIASHARED) $(MACH64SHARED) \
-	$(I915SHARED)
+	$(I915SHARED) $(SAVAGESHARED)
 
 PROGS = dristat drmstat
 
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index 34cbf53b..28995832 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -21,7 +21,7 @@ i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
 radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o radeon_i2c.o
 sis-objs    := sis_drv.o sis_ds.o sis_mm.o
 ffb-objs    := ffb_drv.o ffb_context.o
-savage-objs := savage_drv.o savage_dma.o
+savage-objs := savage_drv.o savage_bci.o savage_state.o
 via-objs    := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o
 mach64-objs := mach64_drv.o mach64_dma.o mach64_irq.o mach64_state.o 
 
diff --git a/linux-core/savage_dma.c b/linux-core/savage_dma.c
deleted file mode 100644
index eb21b09a..00000000
--- a/linux-core/savage_dma.c
+++ /dev/null
@@ -1,80 +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 <linux/interrupt.h>	/* For task queue support */
-#include <linux/delay.h>
-
-#include "drmP.h"
-#include "savage_drm.h"
-#include "savage_drv.h"
-
-#define SAVAGE_DEFAULT_USEC_TIMEOUT	10000
-#define SAVAGE_FREELIST_DEBUG		0
-
-int savage_preinit(drm_device_t * dev, unsigned long chipset)
-{
-	drm_savage_private_t *dev_priv;
-	unsigned mmioBase, fbBase, fbSize, apertureBase;
-	int ret = 0;
-
-	dev_priv = drm_alloc(sizeof(drm_savage_private_t), DRM_MEM_DRIVER);
-	if (dev_priv == NULL)
-		return DRM_ERR(ENOMEM);
-
-	memset(dev_priv, 0, sizeof(drm_savage_private_t));
-	dev->dev_private = (void *)dev_priv;
-	dev_priv->chipset = (enum savage_family)chipset;
-
-	if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
-		fbBase = pci_resource_start(dev->pdev, 0);
-		fbSize = SAVAGE_FB_SIZE_S3;
-		mmioBase = fbBase + fbSize;
-		apertureBase = fbBase + SAVAGE_APERTURE_OFFSET;
-	} else if (chipset != S3_SUPERSAVAGE) {
-		mmioBase = pci_resource_start(dev->pdev, 0);
-		fbBase = pci_resource_start(dev->pdev, 1);
-		fbSize = SAVAGE_FB_SIZE_S4;
-		apertureBase = fbBase + SAVAGE_APERTURE_OFFSET;
-	} else {
-		mmioBase = pci_resource_start(dev->pdev, 0);
-		fbBase = pci_resource_start(dev->pdev, 1);
-		fbSize = pci_resource_len(dev->pdev, 1);
-		apertureBase = pci_resource_start(dev->pdev, 2);
-	}
-
-	if ((ret = drm_initmap(dev, mmioBase, SAVAGE_MMIO_SIZE,
-			       _DRM_REGISTERS, 0)))
-		return ret;
-
-	if ((ret = drm_initmap(dev, fbBase, fbSize,
-			       _DRM_FRAME_BUFFER, _DRM_WRITE_COMBINING)))
-		return ret;
-
-	if ((ret = drm_initmap(dev, apertureBase, SAVAGE_APERTURE_SIZE,
-			       _DRM_FRAME_BUFFER, _DRM_WRITE_COMBINING)))
-		return ret;
-
-	return ret;
-}
diff --git a/linux-core/savage_drm.h b/linux-core/savage_drm.h
deleted file mode 100644
index ee06d68a..00000000
--- a/linux-core/savage_drm.h
+++ /dev/null
@@ -1,233 +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 __SAVAGE_DRM_H__
-#define __SAVAGE_DRM_H__
-
-#ifndef __SAVAGE_SAREA_DEFINES__
-#define __SAVAGE_SAREA_DEFINES__
-
-#define DRM_SAVAGE_MEM_PAGE (1UL<<12)
-#define DRM_SAVAGE_MEM_WORK 32
-#define DRM_SAVAGE_MEM_LOCATION_PCI 1
-#define DRM_SAVAGE_MEM_LOCATION_AGP 2
-#define DRM_SAVAGE_DMA_AGP_SIZE (16*1024*1024)
-
-typedef struct drm_savage_alloc_cont_mem {
-	size_t size;		/*size of buffer */
-	unsigned long type;	/*4k page or word */
-	unsigned long alignment;
-	unsigned long location;	/*agp or pci */
-
-	unsigned long phyaddress;
-	unsigned long linear;
-} drm_savage_alloc_cont_mem_t;
-
-typedef struct drm_savage_get_physcis_address {
-	unsigned long v_address;
-	unsigned long p_address;
-} drm_savage_get_physcis_address_t;
-
-/*ioctl number*/
-#define DRM_IOCTL_SAVAGE_ALLOC_CONTINUOUS_MEM \
-	DRM_IOWR(0x40,drm_savage_alloc_cont_mem_t)
-#define DRM_IOCTL_SAVAGE_GET_PHYSICS_ADDRESS \
-	DRM_IOWR(0x41, drm_savage_get_physcis_address_t)
-#define DRM_IOCTL_SAVAGE_FREE_CONTINUOUS_MEM \
-	DRM_IOWR(0x42, drm_savage_alloc_cont_mem_t)
-
-#define SAVAGE_FRONT		0x1
-#define SAVAGE_BACK		0x2
-#define SAVAGE_DEPTH		0x4
-#define SAVAGE_STENCIL		0x8
-
-/* What needs to be changed for the current vertex dma buffer?
- */
-#define SAVAGE_UPLOAD_CTX	0x1
-#define SAVAGE_UPLOAD_TEX0	0x2
-#define SAVAGE_UPLOAD_TEX1	0x4
-#define SAVAGE_UPLOAD_PIPE	0x8	/* <- seems should be removed, Jiayo Hsu */
-#define SAVAGE_UPLOAD_TEX0IMAGE	0x10	/* handled client-side */
-#define SAVAGE_UPLOAD_TEX1IMAGE	0x20	/* handled client-side */
-#define SAVAGE_UPLOAD_2D	0x40
-#define SAVAGE_WAIT_AGE		0x80	/* handled client-side */
-#define SAVAGE_UPLOAD_CLIPRECTS	0x100	/* handled client-side */
-/*frank:add Buffer state 2001/11/15*/
-#define SAVAGE_UPLOAD_BUFFERS 0x200
-/* original marked off in MGA drivers , Jiayo Hsu Oct.23,2001 */
-
-/* Keep these small for testing.
- */
-#define SAVAGE_NR_SAREA_CLIPRECTS	8
-
-/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
- * regions, subject to a minimum region size of (1<<16) == 64k.
- *
- * Clients may subdivide regions internally, but when sharing between
- * clients, the region size is the minimum granularity.
- */
-
-#define SAVAGE_CARD_HEAP		0
-#define SAVAGE_AGP_HEAP			1
-#define SAVAGE_NR_TEX_HEAPS		2
-#define SAVAGE_NR_TEX_REGIONS		16	/* num. of global texture manage list element */
-#define SAVAGE_LOG_MIN_TEX_REGION_SIZE	16	/* each region 64K, Jiayo Hsu */
-
-#endif				/* __SAVAGE_SAREA_DEFINES__ */
-
-/* drm_tex_region_t define in drm.h */
-
-typedef drm_tex_region_t drm_savage_tex_region_t;
-
-/* Setup registers for 2D, X server
- */
-typedef struct {
-	unsigned int pitch;
-} drm_savage_server_regs_t;
-
-typedef struct _drm_savage_sarea {
-	/* The channel for communication of state information to the kernel
-	 * on firing a vertex dma buffer.
-	 */
-	unsigned int setup[28];	/* 3D context registers */
-	drm_savage_server_regs_t server_state;
-
-	unsigned int dirty;
-
-	unsigned int vertsize;	/* vertext  size */
-
-	/* The current cliprects, or a subset thereof.
-	 */
-	drm_clip_rect_t boxes[SAVAGE_NR_SAREA_CLIPRECTS];
-	unsigned int nbox;
-
-	/* Information about the most recently used 3d drawable.  The
-	 * client fills in the req_* fields, the server fills in the
-	 * exported_ fields and puts the cliprects into boxes, above.
-	 *
-	 * The client clears the exported_drawable field before
-	 * clobbering the boxes data.
-	 */
-	unsigned int req_drawable;	/* the X drawable id */
-	unsigned int req_draw_buffer;	/* SAVAGE_FRONT or SAVAGE_BACK */
-
-	unsigned int exported_drawable;
-	unsigned int exported_index;
-	unsigned int exported_stamp;
-	unsigned int exported_buffers;
-	unsigned int exported_nfront;
-	unsigned int exported_nback;
-	int exported_back_x, exported_front_x, exported_w;
-	int exported_back_y, exported_front_y, exported_h;
-	drm_clip_rect_t exported_boxes[SAVAGE_NR_SAREA_CLIPRECTS];
-
-	/* Counters for aging textures and for client-side throttling.
-	 */
-	unsigned int status[4];
-
-	/* LRU lists for texture memory in agp space and on the card.
-	 */
-	drm_tex_region_t texList[SAVAGE_NR_TEX_HEAPS][SAVAGE_NR_TEX_REGIONS +
-						      1];
-	unsigned int texAge[SAVAGE_NR_TEX_HEAPS];
-
-	/* Mechanism to validate card state.
-	 */
-	int ctxOwner;
-	unsigned long shadow_status[64];	/*too big? */
-
-	/*agp offset */
-	unsigned long agp_offset;
-} drm_savage_sarea_t, *drm_savage_sarea_ptr;
-
-typedef struct drm_savage_init {
-
-	unsigned long sarea_priv_offset;
-
-	int chipset;
-	int sgram;
-
-	unsigned int maccess;
-
-	unsigned int fb_cpp;
-	unsigned int front_offset, front_pitch;
-	unsigned int back_offset, back_pitch;
-
-	unsigned int depth_cpp;
-	unsigned int depth_offset, depth_pitch;
-
-	unsigned int texture_offset[SAVAGE_NR_TEX_HEAPS];
-	unsigned int texture_size[SAVAGE_NR_TEX_HEAPS];
-
-	unsigned long fb_offset;
-	unsigned long mmio_offset;
-	unsigned long status_offset;
-} drm_savage_init_t;
-
-typedef struct drm_savage_fullscreen {
-	enum {
-		SAVAGE_INIT_FULLSCREEN = 0x01,
-		SAVAGE_CLEANUP_FULLSCREEN = 0x02
-	} func;
-} drm_savage_fullscreen_t;
-
-typedef struct drm_savage_clear {
-	unsigned int flags;
-	unsigned int clear_color;
-	unsigned int clear_depth;
-	unsigned int color_mask;
-	unsigned int depth_mask;
-} drm_savage_clear_t;
-
-typedef struct drm_savage_vertex {
-	int idx;		/* buffer to queue */
-	int used;		/* bytes in use */
-	int discard;		/* client finished with buffer?  */
-} drm_savage_vertex_t;
-
-typedef struct drm_savage_indices {
-	int idx;		/* buffer to queue */
-	unsigned int start;
-	unsigned int end;
-	int discard;		/* client finished with buffer?  */
-} drm_savage_indices_t;
-
-typedef struct drm_savage_iload {
-	int idx;
-	unsigned int dstorg;
-	unsigned int length;
-} drm_savage_iload_t;
-
-typedef struct _drm_savage_blit {
-	unsigned int planemask;
-	unsigned int srcorg;
-	unsigned int dstorg;
-	int src_pitch, dst_pitch;
-	int delta_sx, delta_sy;
-	int delta_dx, delta_dy;
-	int height, ydir;	/* flip image vertically */
-	int source_pitch, dest_pitch;
-} drm_savage_blit_t;
-
-#endif
diff --git a/linux-core/savage_drv.c b/linux-core/savage_drv.c
index e8591689..fff5b68a 100644
--- a/linux-core/savage_drv.c
+++ b/linux-core/savage_drv.c
@@ -1,6 +1,7 @@
-/*
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+/* savage_drv.c -- Savage driver for Linux
+ *
+ * Copyright 2004  Felix Kuehling
+ * 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"),
@@ -13,13 +14,13 @@
  * 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.
+ * 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 FELIX KUEHLING 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 <linux/config.h>
@@ -27,220 +28,6 @@
 #include "savage_drm.h"
 #include "savage_drv.h"
 
-#define DRIVER_AUTHOR		"John Zhao, S3 Graphics Inc."
-
-#define DRIVER_NAME		"savage"
-#define DRIVER_DESC		"Savage4 Family"
-#define DRIVER_DATE		"20011023"
-
-#define DRIVER_MAJOR		1
-#define DRIVER_MINOR		0
-#define DRIVER_PATCHLEVEL	0
-
-/* Currently Savage4 not implement DMA */
-/* mark off by Jiayo Hsu, Oct. 23, 2001*/
-
-
-#if SAVAGE_CMD_DMA /* Check the 3D driver, and we need to fix this anyway */
-
-int savage_alloc_continuous_mem(struct inode *inode, struct file *filp,
-		unsigned int cmd, unsigned long arg)
-{
-  drm_savage_alloc_cont_mem_t cont_mem;
-  unsigned long size,addr;
-  void * ret;
-  int i;
-  mem_map_t *p;
-  pgprot_t flags;
-
-  /* add to list */
-  drm_file_t *priv = filp->private_data;
-  drm_device_t *dev = priv->dev;
-  drm_map_t *map;
-  drm_map_list_t *list;
-
-  if (copy_from_user(&cont_mem,(drm_savage_alloc_cont_mem_t *)arg,sizeof(cont_mem)))
-    return -EFAULT;
-
-  map = savage_alloc)( sizeof(*map), DRM_MEM_MAPS );
-  if ( !map )
-    return -ENOMEM;
-
-  /*check the parameters*/
-  if (cont_mem.size <= 0 )
-    return -EINVAL;
-
-  size = cont_mem.type * cont_mem.size;
-  printk("[drm]JTLIsize = %lu\n",size);
-
-  ret = (void *)__get_free_pages(GFP_KERNEL, get_order(size));
-  if (ret == NULL)
-    {
-      printk("Kalloc error\n");
-      return 0;
-    }
-
-  /*set the reserverd flag so that the remap_page_range can map these page*/
-  for(i=0,p=virt_to_page(ret);i< size /PAGE_SIZE; i++,p++)
-    SetPageReserved(p);
-
-  cont_mem.phyaddress = virt_to_bus(ret);
-  cont_mem.location = DRM_SAVAGE_MEM_LOCATION_PCI; /* pci only at present*/
-
-
-  /*Map the memory to user space*/
-  down_write(&current->mm->mmap_sem);
-  addr=do_mmap(NULL,0,size,PROT_READ|PROT_WRITE,MAP_PRIVATE,cont_mem.phyaddress);
-  if (addr<=0)
-    return -EFAULT;
-  pgprot_val(flags)=_PAGE_PRESENT | _PAGE_RW |_PAGE_USER ;
-  if (remap_page_range(addr,cont_mem.phyaddress,size,flags))
-    return -EFAULT;
-  up_write(&current->mm->mmap_sem);
-
-  for(i=0,p=virt_to_page(ret);i< size /PAGE_SIZE; i++,p++)
-    ClearPageReserved(p);
-
-  cont_mem.linear = addr;
-
-  /*map list*/
-  map->handle =  ret; /* to distinguish with other*/
-  map->offset = cont_mem.phyaddress;
-  map->size = size;
-  map->mtrr=-1;
-  /*map-flags,type??*/
-
-  list = savage_alloc)(sizeof(*list), DRM_MEM_MAPS);
-  if(!list) {
-    savage_free)(map, sizeof(*map), DRM_MEM_MAPS);
-    return -EINVAL;
-  }
-  memset(list, 0, sizeof(*list));
-  list->map = map;
-
-  down(&dev->struct_sem);
-  list_add(&list->head, &dev->maplist->head);
-  up(&dev->struct_sem);
-
-  if (copy_to_user((drm_savage_alloc_cont_mem_t *)arg,&cont_mem,sizeof(cont_mem)))
-    return -EFAULT;
-
-  for(i=0,p=virt_to_page(ret);i< size /PAGE_SIZE; i++,p++)
-    atomic_set(&p->count,1);
-
-  return 1;/*success*/
-}
-
-int savage_get_physics_address(struct inode *inode, struct file *filp,
-			       unsigned int cmd, unsigned long arg)
-{
-
-  drm_savage_get_physcis_address_t req;
-  unsigned long buf;
-  pgd_t *pgd;
-  pmd_t *pmd;
-  pte_t *pte;
-  struct mm_struct *mm;
-
-  if (copy_from_user(&req,(drm_savage_get_physcis_address_t *)arg,sizeof(req)))
-    return -EFAULT;
-  buf = req.v_address;
-
-  /*What kind of virtual address ?*/
-  if (buf >= (unsigned long)high_memory)
-    mm = &init_mm;
-  else
-    mm = current->mm;
-
-#ifdef LINUX_24
-  spin_lock(&mm->page_table_lock);
-#endif
-
-  pgd=pgd_offset(mm,buf);
-  pmd=pmd_offset(pgd,buf);
-  pte=pte_offset_map(pmd,buf);
-
-  if (!pte_present(*pte))
-    return -EFAULT;
-
-  req.p_address = ((pte_val(*pte) &PAGE_MASK) |( buf&(PAGE_SIZE-1)));
-
-  if (copy_to_user((drm_savage_get_physcis_address_t  *)arg,&req,sizeof(req)))
-    return -EFAULT;
-  return 1;
-}
-
-/*free the continuous memory*/
-int savage_free_cont_mem(struct inode *inode, struct file *filp,
-			       unsigned int cmd, unsigned long arg)
-{
-  drm_savage_alloc_cont_mem_t cont_mem;
-  unsigned long size;
-
-  /*map  list */
-  drm_file_t *priv = filp->private_data;
-  drm_device_t *dev = priv->dev;
-  drm_map_t *map;
-  struct list_head *list;
-  drm_map_list_t *r_list = NULL;
-
-  if (copy_from_user(&cont_mem,(drm_savage_alloc_cont_mem_t *)arg,sizeof(cont_mem)))
-    return -EFAULT;
-  size = cont_mem.type * cont_mem.size;
-  if (size <= 0)
-    return -EINVAL;
-
-  /* find the map in the list */
-  list_for_each(list,&dev->maplist->head)
-    {
-      r_list = (drm_map_list_t *) list;
-
-      if(r_list->map &&
-	 r_list->map->offset == cont_mem.phyaddress )
-	 break;
-    }
-  /*find none*/
-  if(list == (&dev->maplist->head)) {
-    up(&dev->struct_sem);
-    return -EINVAL;
-  }
-  map = r_list->map;
-  list_del(list);
-  savage_free)(list, sizeof(*list), DRM_MEM_MAPS);
-
-  /*unmap the user space */
-#ifdef DO_MUNMAP_4_ARGS
-  if ( do_munmap(current->mm,cont_mem.linear,size,1)!=0)
-#else
-  if ( do_munmap(current->mm,cont_mem.linear,size)!=0)
-#endif
-    return -EFAULT;
-  /*free the page*/
-  free_pages((unsigned long)map->handle, get_order(size));
-
-  return 1;
-}
-#else /* SAVAGE_CMD_DMA */
-#define DRIVER_IOCTLS
-#endif /* SAVAGE_CMD_DMA */
-
-#if 0
-
-#define DRIVER_IOCTLS							   \
-	[DRM_IOCTL_NR(DRM_IOCTL_DMA)]	      = { mga_dma_buffers, 1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INIT)]    = { mga_dma_init,    1, 1 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_FLUSH)]   = { mga_dma_flush,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_RESET)]   = { mga_dma_reset,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_SWAP)]    = { mga_dma_swap,    1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_CLEAR)]   = { mga_dma_clear,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_VERTEX)]  = { mga_dma_vertex,  1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_INDICES)] = { mga_dma_indices, 1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_ILOAD)]   = { mga_dma_iload,   1, 0 }, \
-	[DRM_IOCTL_NR(DRM_IOCTL_MGA_BLIT)]    = { mga_dma_blit,    1, 0 },
-
-
-#endif /* end #if 0 */
-
 #include "drm_pciids.h"
 
 static int postinit( struct drm_device *dev, unsigned long flags )
@@ -275,24 +62,27 @@ static struct pci_device_id pciidlist[] = {
 };
 
 static drm_ioctl_desc_t ioctls[] = {
-#if SAVAGE_CMD_DMA /* Check the 3D driver, and we need to fix this anyway */
-	[DRM_IOCTL_NR(DRM_SAVAGE_ALLOC_CONTINUOUS_MEM)] = {savage_alloc_continuous_mem, 1, 0},
-	[DRM_IOCTL_NR(DRM_SAVAGE_GET_PHYSICS_ADDRESS)]  = {savage_get_physics_address,  1, 0},
-	[DRM_IOCTL_NR(DRM_SAVAGE_FREE_CONTINUOUS_MEM)]  = {savage_free_cont_mem,        1, 0},
-#endif
+	[DRM_IOCTL_NR(DRM_SAVAGE_BCI_INIT)] = {savage_bci_init, 1, 1},
+	[DRM_IOCTL_NR(DRM_SAVAGE_BCI_CMDBUF)] = {savage_bci_cmdbuf, 1, 0},
+	[DRM_IOCTL_NR(DRM_SAVAGE_BCI_EVENT_EMIT)] = {savage_bci_event_emit, 1, 0},
+	[DRM_IOCTL_NR(DRM_SAVAGE_BCI_EVENT_WAIT)] = {savage_bci_event_wait, 1, 0},
 };
 
 static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static struct drm_driver driver = {
-	.driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR,
-	.reclaim_buffers = drm_core_reclaim_buffers,
-	.get_map_ofs = drm_core_get_map_ofs,
-	.get_reg_ofs = drm_core_get_reg_ofs,
+	.driver_features =
+	    DRIVER_USE_AGP | DRIVER_USE_MTRR |
+	    DRIVER_HAVE_DMA | DRIVER_PCI_DMA,
+	.dev_priv_size = sizeof(drm_savage_buf_priv_t),
 	.preinit = savage_preinit,
 	.postinit = postinit,
+	.reclaim_buffers = savage_reclaim_buffers,
+	.get_map_ofs = drm_core_get_map_ofs,
+	.get_reg_ofs = drm_core_get_reg_ofs,
 	.version = version,
 	.ioctls = ioctls,
 	.num_ioctls = DRM_ARRAY_SIZE(ioctls),
+	.dma_ioctl = savage_bci_buffers,
 	.fops = {
 		.owner   = THIS_MODULE,
 		.open	 = drm_open,
diff --git a/linux-core/savage_drv.h b/linux-core/savage_drv.h
deleted file mode 100644
index 69ae8692..00000000
--- a/linux-core/savage_drv.h
+++ /dev/null
@@ -1,74 +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 __SAVAGE_DRV_H__
-#define __SAVAGE_DRV_H__
-
-/* these chip tags should match the ones in the 2D driver in savage_regs.h. */
-enum savage_family {
-	S3_UNKNOWN = 0,
-	S3_SAVAGE3D,
-	S3_SAVAGE_MX,
-	S3_SAVAGE4,
-	S3_PROSAVAGE,
-	S3_TWISTER,
-	S3_PROSAVAGEDDR,
-	S3_SUPERSAVAGE,
-	S3_SAVAGE2000,
-	S3_LAST
-};
-
-extern int savage_preinit(drm_device_t * dev, unsigned long chipset);
-
-#define S3_SAVAGE3D_SERIES(chip)  ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
-
-#define S3_SAVAGE4_SERIES(chip)  ((chip==S3_SAVAGE4)            \
-                                  || (chip==S3_PROSAVAGE)       \
-                                  || (chip==S3_TWISTER)         \
-                                  || (chip==S3_PROSAVAGEDDR))
-
-#define	S3_SAVAGE_MOBILE_SERIES(chip)	((chip==S3_SAVAGE_MX) || (chip==S3_SUPERSAVAGE))
-
-#define S3_SAVAGE_SERIES(chip)    ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE2000))
-
-#define S3_MOBILE_TWISTER_SERIES(chip)   ((chip==S3_TWISTER)    \
-                                          ||(chip==S3_PROSAVAGEDDR))
-
-/* flags */
-#define SAVAGE_IS_AGP 1
-
-typedef struct drm_savage_private {
-	drm_savage_sarea_t *sarea_priv;
-
-	enum savage_family chipset;
-	unsigned flags;
-
-} drm_savage_private_t;
-
-#define SAVAGE_FB_SIZE_S3	0x01000000	/*  16MB */
-#define SAVAGE_FB_SIZE_S4	0x02000000	/*  32MB */
-#define SAVAGE_MMIO_SIZE        0x00080000	/* 512kB */
-#define SAVAGE_APERTURE_OFFSET  0x02000000	/*  32MB */
-#define SAVAGE_APERTURE_SIZE    0x05000000	/* 5 tiled surfaces, 16MB each */
-
-#endif				/* end #ifndef __SAVAGE_DRV_ */