Index: lib/GL/dri/drm/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/dri/drm/Imakefile,v
retrieving revision 1.23
diff -u -r1.23 Imakefile
--- lib/GL/dri/drm/Imakefile	22 Oct 2002 23:38:12 -0000	1.23
+++ lib/GL/dri/drm/Imakefile	3 Feb 2003 23:16:11 -0000
@@ -31,7 +31,7 @@
 OS_SUBDIR = linux
 OS_SUBDIR2 = linux
 #endif
-#if defined(FreeBSDArchitecture) || defined(BSDOSArchitecture)
+#if defined(FreeBSDArchitecture) || defined(BSDOSArchitecture) || defined(NetBSDArchitecture)
 OS_SUBDIR = bsd
 OS_SUBDIR2 = linux
 #endif
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd,v
retrieving revision 1.6
diff -u -r1.6 Makefile.bsd
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd	27 Aug 2002 01:22:55 -0000	1.6
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd	3 Feb 2003 23:18:34 -0000
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 # i810, i830 & sis are not complete
-SUBDIR = gamma mga r128 radeon tdfx # i810 i830 sis
+SUBDIR = mga r128 radeon tdfx # i810 i830 sis gamma
 
 .include <bsd.subdir.mk>
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/ati_pcigart.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/ati_pcigart.h,v
retrieving revision 1.2
diff -u -r1.2 ati_pcigart.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/ati_pcigart.h	5 Jul 2002 08:31:07 -0000	1.2
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/ati_pcigart.h	3 Feb 2003 23:18:34 -0000
@@ -82,17 +82,8 @@
 		goto done;
 	}
 
-	/* FIXME non-vtophys==bustophys-arches */
+	/* XXX: we need to busdma this */
 	bus_address = vtophys( address );
-	/*pci_map_single(dev->pdev, (void *)address,
-				  ATI_PCIGART_TABLE_PAGES * PAGE_SIZE,
-				  PCI_DMA_TODEVICE);*/
-/*	if (bus_address == 0) {
-		DRM_ERROR( "unable to map PCIGART pages!\n" );
-		DRM(ati_free_pcigart_table)( (unsigned long)address );
-		address = 0;
-		goto done;
-	}*/
 
 	pci_gart = (u32 *)address;
 
@@ -102,16 +93,7 @@
 	bzero( pci_gart, ATI_MAX_PCIGART_PAGES * sizeof(u32) );
 
 	for ( i = 0 ; i < pages ; i++ ) {
-		/* we need to support large memory configurations */
-		/* FIXME non-vtophys==vtobus-arches */
 		entry->busaddr[i] = vtophys( entry->handle + (i*PAGE_SIZE) );
-/*		if (entry->busaddr[i] == 0) {
-			DRM_ERROR( "unable to map PCIGART pages!\n" );
-			DRM(ati_pcigart_cleanup)( dev, (unsigned long)address, bus_address );
-			address = 0;
-			bus_address = 0;
-			goto done;
-		}*/
 		page_base = (u32) entry->busaddr[i];
 
 		for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) {
@@ -122,7 +104,7 @@
 
 	ret = 1;
 
-	DRM_READMEMORYBARRIER();
+	/*DRM_READMEMORYBARRIER();*/
 
 done:
 	*addr = address;
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h,v
retrieving revision 1.11
diff -u -r1.11 drmP.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h	6 Dec 2002 02:27:30 -0000	1.11
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h	3 Feb 2003 23:21:05 -0000
@@ -121,15 +121,15 @@
 
 				/* Mapping helper macros */
 #define DRM_IOREMAP(map)						\
-	(map)->handle = DRM(ioremap)( (map)->offset, (map)->size )
+	(map)->handle = DRM(ioremap)( dev, map )
 
 #define DRM_IOREMAP_NOCACHE(map)					\
-	(map)->handle = DRM(ioremap_nocache)((map)->offset, (map)->size)
+	(map)->handle = DRM(ioremap_nocache)( dev, map )
 
 #define DRM_IOREMAPFREE(map)						\
 	do {								\
 		if ( (map)->handle && (map)->size )			\
-			DRM(ioremapfree)( (map)->handle, (map)->size );	\
+			DRM(ioremapfree)( map );			\
 	} while (0)
 
 				/* Internal types and structures */
@@ -377,7 +377,6 @@
 	unsigned long   handle;
 	void            *virtual;
 	int             pages;
-	struct page     **pagelist;
 	dma_addr_t	*busaddr;
 } drm_sg_mem_t;
 
@@ -386,10 +385,23 @@
 	drm_hw_lock_t *lock;
 } drm_sigdata_t;
 
+typedef struct drm_local_map {
+	unsigned long	offset;	 /* Physical address (0 for SAREA)*/
+	unsigned long	size;	 /* Physical size (bytes)	    */
+	drm_map_type_t	type;	 /* Type of memory mapped		    */
+	drm_map_flags_t flags;	 /* Flags				    */
+	void		*handle; /* User-space: "Handle" to pass to mmap    */
+				 /* Kernel-space: kernel-virtual address    */
+	int		mtrr;	 /* MTRR slot used			    */
+				 /* Private data			    */
+	bus_space_tag_t iot;
+	bus_space_handle_t ioh;
+} drm_local_map_t;
+
 typedef TAILQ_HEAD(drm_map_list, drm_map_list_entry) drm_map_list_t;
 typedef struct drm_map_list_entry {
 	TAILQ_ENTRY(drm_map_list_entry) link;
-	drm_map_t	*map;
+	drm_local_map_t	*map;
 } drm_map_list_entry_t;
 
 TAILQ_HEAD(drm_vbl_sig_list, drm_vbl_sig);
@@ -440,7 +452,7 @@
 	drm_map_list_t	  *maplist;	/* Linked list of regions	   */
 	int		  map_count;	/* Number of mappable regions	   */
 
-	drm_map_t	  **context_sareas;
+	drm_local_map_t	  **context_sareas;
 	int		  max_context;
 
 	drm_vma_entry_t	  *vmalist;	/* List of vmas (for debugging)	   */
@@ -454,9 +466,9 @@
 	drm_device_dma_t  *dma;		/* Optional pointer for DMA support */
 
 				/* Context support */
-#ifdef __FreeBSD__
 	int		  irq;		/* Interrupt used by board	   */
 	int		  irqrid;		/* Interrupt used by board	   */
+#ifdef __FreeBSD__
 	struct resource   *irqr;	/* Resource for interrupt used by board	   */
 #elif defined(__NetBSD__)
 	struct pci_attach_args  pa;
@@ -530,15 +542,16 @@
 
 				/* Memory management support (drm_memory.h) */
 extern void	     DRM(mem_init)(void);
+extern void	     DRM(mem_uninit)(void);
 extern void	     *DRM(alloc)(size_t size, int area);
 extern void	     *DRM(realloc)(void *oldpt, size_t oldsize, size_t size,
 				   int area);
 extern char	     *DRM(strdup)(const char *s, int area);
 extern void	     DRM(strfree)(char *s, int area);
 extern void	     DRM(free)(void *pt, size_t size, int area);
-extern void	     *DRM(ioremap)(unsigned long offset, unsigned long size);
-extern void	     *DRM(ioremap_nocache)(unsigned long offset, unsigned long size);
-extern void	     DRM(ioremapfree)(void *pt, unsigned long size);
+extern void	     *DRM(ioremap)(drm_device_t *dev, drm_local_map_t *map);
+extern void	     *DRM(ioremap_nocache)(drm_device_t *dev, drm_local_map_t *map);
+extern void	     DRM(ioremapfree)(drm_local_map_t *map);
 
 #if __REALLY_HAVE_AGP
 extern agp_memory    *DRM(alloc_agp)(int pages, u32 type);
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_agpsupport.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_agpsupport.h,v
retrieving revision 1.4
diff -u -r1.4 drm_agpsupport.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_agpsupport.h	26 Sep 2002 07:21:05 -0000	1.4
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_agpsupport.h	3 Feb 2003 23:21:05 -0000
@@ -37,7 +37,8 @@
 	struct agp_info *kern;
 	drm_agp_info_t   info;
 
-	if (!dev->agp || !dev->agp->acquired) return EINVAL;
+	if (!dev->agp || !dev->agp->acquired)
+		return EINVAL;
 
 	kern                   = &dev->agp->info;
 	agp_get_info(dev->agp->agpdev, kern);
@@ -60,9 +61,11 @@
 	DRM_DEVICE;
 	int          retcode;
 
-	if (!dev->agp || dev->agp->acquired) return EINVAL;
+	if (!dev->agp || dev->agp->acquired)
+		return EINVAL;
 	retcode = agp_acquire(dev->agp->agpdev);
-	if (retcode) return retcode;
+	if (retcode)
+		return retcode;
 	dev->agp->acquired = 1;
 	return 0;
 }
@@ -93,7 +96,8 @@
 	DRM_DEVICE;
 	drm_agp_mode_t mode;
 
-	if (!dev->agp || !dev->agp->acquired) return EINVAL;
+	if (!dev->agp || !dev->agp->acquired)
+		return EINVAL;
 
 	mode = *(drm_agp_mode_t *) data;
 	
@@ -114,7 +118,8 @@
 	u_int32_t	 type;
 	struct agp_memory_info info;
 
-	if (!dev->agp || !dev->agp->acquired) return EINVAL;
+	if (!dev->agp || !dev->agp->acquired)
+		return EINVAL;
 
 	request = *(drm_agp_buffer_t *) data;
 
@@ -136,7 +141,8 @@
 	entry->pages     = pages;
 	entry->prev      = NULL;
 	entry->next      = dev->agp->memory;
-	if (dev->agp->memory) dev->agp->memory->prev = entry;
+	if (dev->agp->memory)
+		dev->agp->memory->prev = entry;
 	dev->agp->memory = entry;
 
 	agp_memory_info(dev->agp->agpdev, entry->handle, &info);
@@ -166,7 +172,8 @@
 	drm_agp_mem_t     *entry;
 	int retcode;
 
-	if (!dev->agp || !dev->agp->acquired) return EINVAL;
+	if (!dev->agp || !dev->agp->acquired)
+		return EINVAL;
 	request = *(drm_agp_binding_t *) data;
 	if (!(entry = DRM(agp_lookup_entry)(dev, (void *) request.handle)))
 		return EINVAL;
@@ -209,15 +216,20 @@
 	drm_agp_buffer_t request;
 	drm_agp_mem_t    *entry;
 	
-	if (!dev->agp || !dev->agp->acquired) return EINVAL;
+	if (!dev->agp || !dev->agp->acquired)
+		return EINVAL;
 	request = *(drm_agp_buffer_t *) data;
 	if (!(entry = DRM(agp_lookup_entry)(dev, (void*) request.handle)))
 		return EINVAL;
-	if (entry->bound) DRM(unbind_agp)(entry->handle);
+	if (entry->bound)
+		DRM(unbind_agp)(entry->handle);
    
-	if (entry->prev) entry->prev->next = entry->next;
-	else             dev->agp->memory  = entry->next;
-	if (entry->next) entry->next->prev = entry->prev;
+	if (entry->prev)
+		entry->prev->next = entry->next;
+	else
+		dev->agp->memory  = entry->next;
+	if (entry->next)
+		entry->next->prev = entry->prev;
 	DRM(free_agp)(entry->handle, entry->pages);
 	DRM(free)(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
 	return 0;
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_auth.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_auth.h,v
retrieving revision 1.3
diff -u -r1.3 drm_auth.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_auth.h	5 Jul 2002 08:31:07 -0000	1.3
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_auth.h	3 Feb 2003 23:21:08 -0000
@@ -116,25 +116,20 @@
 {
 	static drm_magic_t sequence = 0;
 	drm_auth_t	   auth;
-	static DRM_SPINTYPE lock;
-	static int	   first = 1;
 	DRM_DEVICE;
 	DRM_PRIV;
 
-	if (first) {
-		DRM_SPININIT(lock, "drm getmagic");
-		first = 0;
-	}
-
 				/* Find unique magic */
 	if (priv->magic) {
 		auth.magic = priv->magic;
 	} else {
 		do {
-			DRM_SPINLOCK(&lock);
-			if (!sequence) ++sequence; /* reserve 0 */
-			auth.magic = sequence++;
-			DRM_SPINUNLOCK(&lock);
+			int old = sequence;
+			
+			auth.magic = old+1;
+			
+			if (!atomic_cmpset_int(&sequence, old, auth.magic))
+				continue;
 		} while (DRM(find_file)(dev, auth.magic));
 		priv->magic = auth.magic;
 		DRM(add_magic)(dev, priv, auth.magic);
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_bufs.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_bufs.h,v
retrieving revision 1.3
diff -u -r1.3 drm_bufs.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_bufs.h	29 Sep 2002 23:56:17 -0000	1.3
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_bufs.h	3 Feb 2003 23:21:10 -0000
@@ -69,18 +69,26 @@
 int DRM(addmap)( DRM_IOCTL_ARGS )
 {
 	DRM_DEVICE;
-	drm_map_t *map;
+	drm_map_t request;
+	drm_local_map_t *map;
 	drm_map_list_entry_t *list;
 	
 	if (!(dev->flags & (FREAD|FWRITE)))
 		return DRM_ERR(EACCES); /* Require read/write */
 
-	map = (drm_map_t *) DRM(alloc)( sizeof(*map), DRM_MEM_MAPS );
+	DRM_COPY_FROM_USER_IOCTL( request, (drm_map_t *)data, sizeof(drm_map_t) );
+
+	map = (drm_local_map_t *) DRM(alloc)( sizeof(*map), DRM_MEM_MAPS );
 	if ( !map )
 		return DRM_ERR(ENOMEM);
 
-	*map = *(drm_map_t *)data;
-
+	map->offset = request.offset;
+	map->size = request.size;
+	map->type = request.type;
+	map->flags = request.flags;
+	map->mtrr   = -1;
+	map->handle = 0;
+	
 	/* Only allow shared memory to be removable since we only keep enough
 	 * book keeping information about shared memory to allow for removal
 	 * when processes fork.
@@ -95,22 +103,14 @@
 		DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
 		return DRM_ERR(EINVAL);
 	}
-	map->mtrr   = -1;
-	map->handle = 0;
 
 	switch ( map->type ) {
 	case _DRM_REGISTERS:
 	case _DRM_FRAME_BUFFER:
-#if !defined(__sparc__) && !defined(__alpha__)
-		if ( map->offset + map->size < map->offset
-		) {
+		if ( map->offset + map->size < map->offset ) {
 			DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
 			return DRM_ERR(EINVAL);
 		}
-#endif
-#ifdef __alpha__
-		map->offset += dev->hose->mem_space->start;
-#endif
 #if __REALLY_HAVE_MTRR
 		if ( map->type == _DRM_FRAME_BUFFER ||
 		     (map->flags & _DRM_WRITE_COMBINING) ) {
@@ -130,14 +130,12 @@
 			mtrrmap.base = map->offset;
 			mtrrmap.len = map->size;
 			mtrrmap.type = MTRR_TYPE_WC;
-			mtrrmap.flags = MTRR_PRIVATE | MTRR_VALID;
-			mtrrmap.owner = p->p_pid;
-			/* USER? KERNEL? XXX */
-			map->mtrr = mtrr_get( &mtrrmap, &one, p, MTRR_GETSET_KERNEL );
+			mtrrmap.flags = MTRR_VALID;
+			map->mtrr = mtrr_set( &mtrrmap, &one, p, MTRR_GETSET_KERNEL );
 #endif
 		}
 #endif /* __REALLY_HAVE_MTRR */
-		map->handle = DRM(ioremap)( map->offset, map->size );
+		DRM_IOREMAP(map);
 		break;
 
 	case _DRM_SHM:
@@ -155,9 +153,6 @@
 		break;
 #if __REALLY_HAVE_AGP
 	case _DRM_AGP:
-#ifdef __alpha__
-		map->offset += dev->hose->mem_space->start;
-#endif
 		map->offset += dev->agp->base;
 		map->mtrr   = dev->agp->agp_mtrr; /* for getmap */
 		break;
@@ -187,11 +182,19 @@
 	TAILQ_INSERT_TAIL(dev->maplist, list, link);
 	DRM_UNLOCK;
 
-	*(drm_map_t *)data = *map;
+	request.offset = map->offset;
+	request.size = map->size;
+	request.type = map->type;
+	request.flags = map->flags;
+	request.mtrr   = map->mtrr;
+	request.handle = map->handle;
 
-	if ( map->type != _DRM_SHM ) {
-		((drm_map_t *)data)->handle = (void *)map->offset;
+	if ( request.type != _DRM_SHM ) {
+		request.handle = (void *)request.offset;
 	}
+
+	DRM_COPY_TO_USER_IOCTL( (drm_map_t *)data, request, sizeof(drm_map_t) );
+
 	return 0;
 }
 
@@ -204,7 +207,7 @@
 {
 	DRM_DEVICE;
 	drm_map_list_entry_t *list;
-	drm_map_t *map;
+	drm_local_map_t *map;
 	drm_map_t request;
 	int found_maps = 0;
 
@@ -257,7 +260,7 @@
 #endif
 			}
 #endif
-			DRM(ioremapfree)(map->handle, map->size);
+			DRM(ioremapfree)( map );
 			break;
 		case _DRM_SHM:
 			DRM(free)( map->handle, map->size, DRM_MEM_SAREA );
@@ -1018,6 +1021,7 @@
 #endif /* __FreeBSD__ */
 #ifdef __NetBSD__
 	struct vnode *vn;
+	struct vmspace *vms = p->p_vmspace;
 #endif /* __NetBSD__ */
 
 	drm_buf_map_t request;
@@ -1043,7 +1047,7 @@
 	if ( request.count >= dma->buf_count ) {
 		if ( (__HAVE_AGP && (dma->flags & _DRM_DMA_USE_AGP)) ||
 		     (__HAVE_SG && (dma->flags & _DRM_DMA_USE_SG)) ) {
-			drm_map_t *map = DRIVER_AGP_BUFFERS_MAP( dev );
+			drm_local_map_t *map = DRIVER_AGP_BUFFERS_MAP( dev );
 
 			if ( !map ) {
 				retcode = EINVAL;
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_context.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_context.h,v
retrieving revision 1.2
diff -u -r1.2 drm_context.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_context.h	5 Jul 2002 08:31:07 -0000	1.2
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_context.h	3 Feb 2003 23:21:15 -0000
@@ -69,7 +69,7 @@
 		if((bit+1) > dev->max_context) {
 			dev->max_context = (bit+1);
 			if(dev->context_sareas) {
-				drm_map_t **ctx_sareas;
+				drm_local_map_t **ctx_sareas;
 
 				ctx_sareas = DRM(realloc)(dev->context_sareas,
 						(dev->max_context - 1) * 
@@ -149,7 +149,7 @@
 {
 	DRM_DEVICE;
 	drm_ctx_priv_map_t request;
-	drm_map_t *map;
+	drm_local_map_t *map;
 
 	DRM_COPY_FROM_USER_IOCTL( request, (drm_ctx_priv_map_t *)data, 
 			   sizeof(request) );
@@ -174,7 +174,7 @@
 {
 	DRM_DEVICE;
 	drm_ctx_priv_map_t request;
-	drm_map_t *map = NULL;
+	drm_local_map_t *map = NULL;
 	drm_map_list_entry_t *list;
 
 	DRM_COPY_FROM_USER_IOCTL( request, (drm_ctx_priv_map_t *)data,
@@ -183,24 +183,20 @@
 	DRM_LOCK;
 	TAILQ_FOREACH(list, dev->maplist, link) {
 		map=list->map;
-		if(map->handle == request.handle) 
-			goto found;
+		if(map->handle == request.handle) {
+			if (dev->max_context < 0)
+				goto bad;
+			if (request.ctx_id >= (unsigned) dev->max_context)
+				goto bad;
+			dev->context_sareas[request.ctx_id] = map;
+			DRM_UNLOCK;
+			return 0;
+		}
 	}
 
 bad:
 	DRM_UNLOCK;
 	return DRM_ERR(EINVAL);
-
-found:
-	map = list->map;
-	if (!map) goto bad;
-	if (dev->max_context < 0)
-		goto bad;
-	if (request.ctx_id >= (unsigned) dev->max_context)
-		goto bad;
-	dev->context_sareas[request.ctx_id] = map;
-	DRM_UNLOCK;
-	return 0;
 }
 
 /* ================================================================
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_dma.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_dma.h,v
retrieving revision 1.9
diff -u -r1.9 drm_dma.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_dma.h	6 Dec 2002 02:27:30 -0000	1.9
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_dma.h	3 Feb 2003 23:21:16 -0000
@@ -534,9 +534,13 @@
 
 				/* Install handler */
 	dev->irqrid = 0;
+#ifdef __FreeBSD__
 	dev->irqr = bus_alloc_resource(dev->device, SYS_RES_IRQ, &dev->irqrid,
 				      0, ~0, 1, RF_SHAREABLE);
 	if (!dev->irqr) {
+#elif defined(__NetBSD__)
+	if (pci_intr_map(&dev->pa, &dev->ih) != 0) {
+#endif
 		DRM_LOCK;
 		dev->irq = 0;
 		dev->irqrid = 0;
@@ -544,11 +548,19 @@
 		return ENOENT;
 	}
 	
+#ifdef __FreeBSD__
 	retcode = bus_setup_intr(dev->device, dev->irqr, INTR_TYPE_TTY,
 				 DRM(dma_service), dev, &dev->irqh);
 	if ( retcode ) {
+#elif defined(__NetBSD__)
+	dev->irqh = pci_intr_establish(&dev->pa.pa_pc, dev->ih, IPL_TTY,
+				      (int (*)(DRM_IRQ_ARGS))DRM(dma_service), dev);
+	if ( !dev->irqh ) {
+#endif
 		DRM_LOCK;
+#ifdef __FreeBSD__
 		bus_release_resource(dev->device, SYS_RES_IRQ, dev->irqrid, dev->irqr);
+#endif
 		dev->irq = 0;
 		dev->irqrid = 0;
 		DRM_UNLOCK;
@@ -580,9 +592,13 @@
 
 	DRM(driver_irq_uninstall)( dev );
 
+#ifdef __FreeBSD__
 	bus_teardown_intr(dev->device, dev->irqr, dev->irqh);
 	bus_release_resource(dev->device, SYS_RES_IRQ, irqrid, dev->irqr);
-	
+#elif defined(__NetBSD__)
+	pci_intr_disestablish(&dev->pa.pa_pc, dev->irqh);
+#endif
+
 	return 0;
 }
 
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_drv.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_drv.h,v
retrieving revision 1.8
diff -u -r1.8 drm_drv.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_drv.h	27 Oct 2002 05:24:33 -0000	1.8
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_drv.h	3 Feb 2003 23:22:24 -0000
@@ -134,7 +134,6 @@
 #endif
 
 #ifdef __FreeBSD__
-#define CDEV_MAJOR	145
 #define DRIVER_SOFTC(unit) \
 	((drm_device_t *) devclass_get_softc(DRM(devclass), unit))
 
@@ -147,9 +146,8 @@
 #endif /* __FreeBSD__ */
 
 #ifdef __NetBSD__
-#define CDEV_MAJOR	90
 #define DRIVER_SOFTC(unit) \
-	((drm_device_t *) device_lookup(&DRM(_cd), unit))
+	((drm_device_t *) device_lookup(&DRM(cd), unit))
 #endif /* __NetBSD__ */
 
 static drm_ioctl_desc_t		  DRM(ioctls)[] = {
@@ -229,6 +227,27 @@
 const char *DRM(find_description)(int vendor, int device);
 
 #ifdef __FreeBSD__
+static struct cdevsw DRM(cdevsw) = {
+	/* open */	DRM( open ),
+	/* close */	DRM( close ),
+	/* read */	DRM( read ),
+	/* write */	DRM( write ),
+	/* ioctl */	DRM( ioctl ),
+	/* poll */	DRM( poll ),
+	/* mmap */	DRM( mmap ),
+	/* strategy */	nostrategy,
+	/* name */	DRIVER_NAME,
+	/* maj */	CDEV_MAJOR,
+	/* dump */	nodump,
+	/* psize */	nopsize,
+	/* flags */	D_TTY | D_TRACKCLOSE,
+#if __FreeBSD_version >= 500000
+	/* kqfilter */	0
+#else
+	/* bmaj */	-1
+#endif
+};
+
 static int DRM(probe)(device_t dev)
 {
 	const char *s = NULL;
@@ -271,57 +290,111 @@
 	sizeof(drm_device_t),
 };
 
-static devclass_t DRM( devclass);
+static devclass_t DRM(devclass);
 
-static struct cdevsw DRM( cdevsw) = {
-	/* open */	DRM( open ),
-	/* close */	DRM( close ),
-	/* read */	DRM( read ),
-	/* write */	DRM( write ),
-	/* ioctl */	DRM( ioctl ),
-	/* poll */	DRM( poll ),
-	/* mmap */	DRM( mmap ),
-	/* strategy */	nostrategy,
-	/* name */	DRIVER_NAME,
-	/* maj */	CDEV_MAJOR,
-	/* dump */	nodump,
-	/* psize */	nopsize,
-	/* flags */	D_TTY | D_TRACKCLOSE,
-#if __FreeBSD_version >= 500000
-	/* kqfilter */	0
+#elif defined(__NetBSD__)
+
+static struct cdevsw DRM(cdevsw) = {
+	DRM(open),
+	DRM(close),
+	DRM(read),
+	DRM(write),
+	DRM(ioctl),
+	nostop,
+	notty,
+	DRM(poll),
+	DRM(mmap),
+	nokqfilter,
+	D_TTY
+};
+
+int DRM(refcnt) = 0;
+#if __NetBSD_Version__ >= 106080000
+MOD_DEV( DRIVER_NAME, DRIVER_NAME, NULL, -1, &DRM(cdevsw), CDEV_MAJOR);
 #else
-	/* bmaj */	-1
+MOD_DEV( DRIVER_NAME, LM_DT_CHAR, CDEV_MAJOR, &DRM(cdevsw) );
 #endif
-};
 
-#elif defined(__NetBSD__)
-int DRM(probe)(struct device *parent, struct cfdata *match, void *aux);
-void DRM(attach)(struct device *parent, struct device *self, void *aux);
-int DRM(detach)(struct device *self, int flags);
-int DRM(activate)(struct device *self, enum devact act);
-
-struct cfattach DRM(_ca) = {
-	sizeof(drm_device_t), DRM(probe), 
-	DRM(attach), DRM(detach), DRM(activate) };
-	
-int DRM(probe)(struct device *parent, struct cfdata *match, void *aux)
+int DRM(lkmentry)(struct lkm_table *lkmtp, int cmd, int ver);
+static int DRM(lkmhandle)(struct lkm_table *lkmtp, int cmd);
+
+int DRM(modprobe)();
+int DRM(probe)(struct pci_attach_args *pa);
+void DRM(attach)(struct pci_attach_args *pa, dev_t kdev);
+
+int DRM(lkmentry)(struct lkm_table *lkmtp, int cmd, int ver) {
+	DISPATCH(lkmtp, cmd, ver, DRM(lkmhandle), DRM(lkmhandle), DRM(lkmhandle));
+}
+
+static int DRM(lkmhandle)(struct lkm_table *lkmtp, int cmd)
+{
+	int j, error = 0;
+#if defined(__NetBSD__) && (__NetBSD_Version__ > 106080000)
+	struct lkm_dev *args = lkmtp->private.lkm_dev;
+#endif
+
+	switch(cmd) {
+	case LKM_E_LOAD:
+		if (lkmexists(lkmtp))
+			return EEXIST;
+
#if defined(__NetBSD__) && (__NetBSD_Version__ > 106080000)
+		error = devsw_attach(args->lkm_devname,
+		    args->lkm_bdev, &args->lkm_bdevmaj,
+		    args->lkm_cdev, &args->lkm_cdevmaj);
+		if(error != 0)
+			return error;
+#endif
+		if(DRM(modprobe)())
+			return 0;
+
+		return 1;
+
+	case LKM_E_UNLOAD:
+		if (DRM(refcnt) > 0)
+			return (EBUSY);
+
+#if defined(__NetBSD__) && (__NetBSD_Version__ > 106080000)
+		devsw_detach(args->lkm_bdev, args->lkm_cdev);
+#endif
+		break;
+	case LKM_E_STAT:
+		break;
+
+	default:
+		error = EIO;
+		break;
+	}
+	return error;
+}
+
+int DRM(modprobe)() {
+	struct pci_attach_args pa;
+	int error = 0;
+	if((error = pci_find_device(&pa, DRM(probe))) != 0)
+		DRM(attach)(&pa, 0);
+	return error;
+}
+
+int DRM(probe)(struct pci_attach_args *pa)
 {
-	struct pci_attach_args *pa = aux;
 	const char *desc;
 
 	desc = DRM(find_description)(PCI_VENDOR(pa->pa_id), PCI_PRODUCT(pa->pa_id));
-	if (desc != NULL)
+	if (desc != NULL) {
 		return 10;
+	}
+
 	return 0;
 }
 
-void DRM(attach)(struct device *parent, struct device *self, void *aux)
-{
-	struct pci_attach_args *pa = aux;
-	drm_device_t *dev = (drm_device_t *)self;
-	
-	memcpy(&dev->pa, aux, sizeof(dev->pa));
-	
+void DRM(attach)(struct pci_attach_args *pa, dev_t kdev)
+ {
+	int i;
+	DRM_DEVICE;
+
+	memset(dev, 0, sizeof(drm_device_t));
+	memcpy(&dev->pa, pa, sizeof(dev->pa));
+
 	DRM_INFO("%s", DRM(find_description)(PCI_VENDOR(pa->pa_id), PCI_PRODUCT(pa->pa_id)));
 	DRM(init)(dev);
 }
@@ -345,8 +418,7 @@
 	}
 	return (0);
 }
-
-#endif
+#endif /* __NetBSD__ */
 
 const char *DRM(find_description)(int vendor, int device) {
 	const char *s = NULL;
@@ -487,7 +559,7 @@
 static int DRM(takedown)( drm_device_t *dev )
 {
 	drm_magic_entry_t *pt, *next;
-	drm_map_t *map;
+	drm_local_map_t *map;
 	drm_map_list_entry_t *list;
 	drm_vma_entry_t *vma, *vma_next;
 	int i;
@@ -581,15 +653,13 @@
 					mtrrmap.len = map->size;
 					mtrrmap.type = MTRR_TYPE_WC;
 					mtrrmap.flags = 0;
-					/*mtrrmap.owner = p->p_pid;*/
-					/* XXX: Use curproc here? */
 					retcode = mtrr_set( &mtrrmap, &one, 
 						DRM_CURPROC, MTRR_GETSET_KERNEL);
 #endif
 					DRM_DEBUG( "mtrr_del=%d\n", retcode );
 				}
 #endif
-				DRM(ioremapfree)( map->handle, map->size );
+				DRM(ioremapfree)( map );
 				break;
 			case _DRM_SHM:
 				DRM(free)(map->handle,
@@ -724,7 +794,6 @@
 		struct mtrr mtrrmap;
 		int one = 1;
 		mtrrmap.base = dev->agp->info.ai_aperture_base;
-		/* Might need a multiplier here XXX */
 		mtrrmap.len = dev->agp->info.ai_aperture_size;
 		mtrrmap.type = MTRR_TYPE_WC;
 		mtrrmap.flags = MTRR_VALID;
@@ -799,7 +868,7 @@
 		mtrrmap.len = dev->agp->info.ai_aperture_size;
 		mtrrmap.type = 0;
 		mtrrmap.flags = 0;
-		retval = mtrr_set( &mtrrmap, &one, NULL, MTRR_GETSET_KERNEL);
+		mtrr_set( &mtrrmap, &one, NULL, MTRR_GETSET_KERNEL);
 #endif
 	}
 #endif
@@ -814,6 +883,8 @@
 	}
 #endif
 	DRIVER_POSTCLEANUP();
+	DRM(mem_uninit)();
+	DRM_SPINUNINIT(dev->count_lock);
 }
 
 
@@ -1043,7 +1114,6 @@
 		*(int *) data = fgetown(dev->buf_sigio);
 #endif
 		return 0;
-	}
 #endif /* __FreeBSD__ */
 #ifdef __NetBSD__
 	case TIOCSPGRP:
@@ -1056,6 +1126,7 @@
 		*(int *)data = dev->buf_pgid;
 		return 0;
 #endif /* __NetBSD__ */
+	}
 
 	if ( nr >= DRIVER_IOCTL_COUNT ) {
 		retcode = EINVAL;
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_fops.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_fops.h,v
retrieving revision 1.2
diff -u -r1.2 drm_fops.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_fops.h	5 Jul 2002 08:31:07 -0000	1.2
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_fops.h	3 Feb 2003 23:22:26 -0000
@@ -100,7 +100,7 @@
    the circular buffer), is based on Alessandro Rubini's LINUX DEVICE
    DRIVERS (Cambridge: O'Reilly, 1998), pages 111-113. */
 
-ssize_t DRM(read)(dev_t kdev, struct uio *uio, int ioflag)
+int DRM(read)(dev_t kdev, struct uio *uio, int ioflag)
 {
 	DRM_DEVICE;
 	int	      left;
@@ -200,6 +200,7 @@
 			gsignal(dev->buf_pgid, SIGIO);
 		else if(dev->buf_pgid && (p = pfind(-dev->buf_pgid)) != NULL)
 			psignal(p, SIGIO);
+	}
 #endif /* __NetBSD__ */
 	DRM_DEBUG("waking\n");
 	wakeup(&dev->buf_rp);
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_ioctl.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_ioctl.h,v
retrieving revision 1.2
diff -u -r1.2 drm_ioctl.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_ioctl.h	5 Jul 2002 08:31:07 -0000	1.2
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_ioctl.h	3 Feb 2003 23:22:28 -0000
@@ -136,7 +136,7 @@
 {
 	DRM_DEVICE;
 	drm_map_t    map;
-	drm_map_t    *mapinlist;
+	drm_local_map_t    *mapinlist;
 	drm_map_list_entry_t *list;
 	int          idx;
 	int	     i = 0;
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_lists.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_lists.h,v
retrieving revision 1.3
diff -u -r1.3 drm_lists.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_lists.h	5 Jul 2002 08:31:07 -0000	1.3
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_lists.h	3 Feb 2003 23:22:28 -0000
@@ -43,7 +43,7 @@
 
 	if(!bl->bufs) return DRM_ERR(ENOMEM);
 
-	memset(bl->bufs, 0, sizeof(*bl->bufs));
+	bzero(bl->bufs, sizeof(*bl->bufs));
 
 	bl->count      = count;
 	bl->rp	       = bl->bufs;
@@ -66,6 +66,8 @@
 	bl->rp	  = NULL;
 	bl->wp	  = NULL;
 	bl->end	  = NULL;
+	DRM_SPINUNINIT( bl->write_lock );
+	DRM_SPINUNINIT( bl->read_lock );
 	return 0;
 }
 
@@ -137,6 +139,7 @@
 {
 	atomic_set(&bl->count, 0);
 	bl->next = NULL;
+	DRM_SPINUNINIT( bl->lock );
 	return 0;
 }
 
@@ -175,7 +178,7 @@
 				/* Check for high water mark */
 	if (atomic_read(&bl->wfh) && atomic_read(&bl->count)>=bl->high_mark) {
 		atomic_set(&bl->wfh, 0);
-		DRM_WAKEUP_INT(&bl->waiting);
+		DRM_WAKEUP_INT((void *)&bl->waiting);
 	}
 	return 0;
 }
@@ -222,7 +225,7 @@
 			for (;;) {
 				if (!atomic_read(&bl->wfh)
 				    && (buf = DRM(freelist_try(bl)))) break;
-				error = tsleep(&bl->waiting, PZERO|PCATCH,
+				error = tsleep((void *)&bl->waiting, PZERO|PCATCH,
 					       "drmfg", 0);
 				if (error)
 					break;
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_lock.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_lock.h,v
retrieving revision 1.2
diff -u -r1.2 drm_lock.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_lock.h	5 Jul 2002 08:31:07 -0000	1.2
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_lock.h	3 Feb 2003 23:22:28 -0000
@@ -47,14 +47,12 @@
 {
 	unsigned int old, new;
 
-	char failed;
-
 	do {
 		old = *lock;
 		if (old & _DRM_LOCK_HELD) new = old | _DRM_LOCK_CONT;
 		else			  new = context | _DRM_LOCK_HELD;
-		_DRM_CAS(lock, old, new, failed);
-	} while (failed);
+	} while (!atomic_cmpset_int(lock, old, new));
+
 	if (_DRM_LOCKING_CONTEXT(old) == context) {
 		if (old & _DRM_LOCK_HELD) {
 			if (context != DRM_KERNEL_CONTEXT) {
@@ -77,14 +75,13 @@
 		       __volatile__ unsigned int *lock, unsigned int context)
 {
 	unsigned int old, new;
-	char failed;
 
 	dev->lock.pid = 0;
 	do {
 		old  = *lock;
 		new  = context | _DRM_LOCK_HELD;
-		_DRM_CAS(lock, old, new, failed);
-	} while (failed);
+	} while (!atomic_cmpset_int(lock, old, new));
+
 	return 1;
 }
 
@@ -93,14 +90,13 @@
 {
 	unsigned int old, new;
 	pid_t        pid = dev->lock.pid;
-	char failed;
 
 	dev->lock.pid = 0;
 	do {
 		old  = *lock;
 		new  = 0;
-		_DRM_CAS(lock, old, new, failed);
-	} while (failed);
+	} while (!atomic_cmpset_int(lock, old, new));
+
 	if (_DRM_LOCK_IS_HELD(old) && _DRM_LOCKING_CONTEXT(old) != context) {
 		DRM_ERROR("%d freed heavyweight lock held by %d (pid %d)\n",
 			  context,
@@ -224,8 +220,6 @@
 {
 	drm_sigdata_t *s = (drm_sigdata_t *)priv;
 	unsigned int  old, new;
-	char failed;
-
 
 				/* Allow signal delivery if lock isn't held */
 	if (!_DRM_LOCK_IS_HELD(s->lock->lock)
@@ -236,8 +230,8 @@
 	do {
 		old  = s->lock->lock;
 		new  = old | _DRM_LOCK_CONT;
-		_DRM_CAS(&s->lock->lock, old, new, failed);
-	} while (failed);
+	} while (!atomic_cmpset_int(&s->lock->lock, old, new));
+
 	return 0;
 }
 
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_memory.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_memory.h,v
retrieving revision 1.3
diff -u -r1.3 drm_memory.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_memory.h	5 Jul 2002 08:31:07 -0000	1.3
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_memory.h	3 Feb 2003 23:22:30 -0000
@@ -95,9 +95,15 @@
 	DRM(ram_used)	   = 0;
 }
 
+void DRM(mem_uninit)(void)
+{
+	DRM_SPINUNINIT(DRM(mem_lock));
+}
+
 #ifdef __FreeBSD__
 /* drm_mem_info is called whenever a process reads /dev/drm/mem. */
-static int DRM(_mem_info) DRM_SYSCTL_HANDLER_ARGS
+static int DRM(_mem_info)(drm_mem_stats_t *stats, struct sysctl_oid *oidp, void *arg1, 
+    int arg2, struct sysctl_req *req)
 {
 	drm_mem_stats_t *pt;
 	char buf[128];
@@ -112,7 +118,7 @@
 	DRM_SYSCTL_PRINT("%-9.9s %5d %5d %4d %10lu	    |\n",
 		       "locked", 0, 0, 0, DRM(ram_used));
 	DRM_SYSCTL_PRINT("\n");
-	for (pt = DRM(mem_stats); pt->name; pt++) {
+	for (pt = stats; pt->name; pt++) {
 		DRM_SYSCTL_PRINT("%-9.9s %5d %5d %4d %10lu %10lu | %6d %10ld\n",
 			       pt->name,
 			       pt->succeed_count,
@@ -132,13 +138,22 @@
 int DRM(mem_info) DRM_SYSCTL_HANDLER_ARGS
 {
 	int ret;
-
+	drm_mem_stats_t *stats;
+	
+	stats = malloc(sizeof(DRM(mem_stats)), DRM(M_DRM), M_NOWAIT);
+	if (stats == NULL)
+		return ENOMEM;
+	
 	DRM_SPINLOCK(&DRM(mem_lock));
-	ret = DRM(_mem_info)(oidp, arg1, arg2, req);
+	bcopy(DRM(mem_stats), stats, sizeof(DRM(mem_stats)));
 	DRM_SPINUNLOCK(&DRM(mem_lock));
+	
+	ret = DRM(_mem_info)(stats, oidp, arg1, arg2, req);
+	
+	free(stats, DRM(M_DRM));
 	return ret;
 }
-#endif
+#endif /* __FreeBSD__ */
 
 void *DRM(alloc)(size_t size, int area)
 {
@@ -221,25 +236,36 @@
 	}
 }
 
-void *DRM(ioremap)(unsigned long offset, unsigned long size)
+void *DRM(ioremap)( drm_device_t *dev, drm_local_map_t *map )
 {
 	void *pt;
 
-	if (!size) {
+	if (!map->size) {
 		DRM_MEM_ERROR(DRM_MEM_MAPPINGS,
-			      "Mapping 0 bytes at 0x%08lx\n", offset);
+			      "Mapping 0 bytes at 0x%08lx\n", map->offset);
 		return NULL;
 	}
+#ifdef __NetBSD__
+	map->iot = dev->pa.pa_memt;
+#endif
 
-	if (!(pt = pmap_mapdev(offset, size))) {
+#ifdef __FreeBSD__
+	if (!(pt = pmap_mapdev(map->offset, map->size))) {
+#elif defined(__NetBSD__)
+	if (bus_space_map(map->iot, map->offset, map->size, 
+		BUS_SPACE_MAP_LINEAR, &map->ioh)) {
+#endif
 		DRM_SPINLOCK(&DRM(mem_lock));
 		++DRM(mem_stats)[DRM_MEM_MAPPINGS].fail_count;
 		DRM_SPINUNLOCK(&DRM(mem_lock));
 		return NULL;
 	}
+#ifdef __NetBSD__
+	pt = bus_space_vaddr(map->iot, map->ioh);
+#endif
 	DRM_SPINLOCK(&DRM(mem_lock));
 	++DRM(mem_stats)[DRM_MEM_MAPPINGS].succeed_count;
-	DRM(mem_stats)[DRM_MEM_MAPPINGS].bytes_allocated += size;
+	DRM(mem_stats)[DRM_MEM_MAPPINGS].bytes_allocated += map->size;
 	DRM_SPINUNLOCK(&DRM(mem_lock));
 	return pt;
 }
@@ -271,19 +297,23 @@
 }
 #endif
 
-void DRM(ioremapfree)(void *pt, unsigned long size)
+void DRM(ioremapfree)(drm_local_map_t *map)
 {
 	int alloc_count;
 	int free_count;
 
-	if (!pt)
+	if (map->handle == NULL)
 		DRM_MEM_ERROR(DRM_MEM_MAPPINGS,
 			      "Attempt to free NULL pointer\n");
 	else
-		pmap_unmapdev((vm_offset_t) pt, size);
+#ifdef __FreeBSD__
+		pmap_unmapdev((vm_offset_t) map->handle, map->size);
+#elif defined(__NetBSD__)
+		bus_space_unmap(map->iot, map->ioh, map->size);
+#endif
 
 	DRM_SPINLOCK(&DRM(mem_lock));
-	DRM(mem_stats)[DRM_MEM_MAPPINGS].bytes_freed += size;
+	DRM(mem_stats)[DRM_MEM_MAPPINGS].bytes_freed += map->size;
 	free_count  = ++DRM(mem_stats)[DRM_MEM_MAPPINGS].free_count;
 	alloc_count =	DRM(mem_stats)[DRM_MEM_MAPPINGS].succeed_count;
 	DRM_SPINUNLOCK(&DRM(mem_lock));
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h,v
retrieving revision 1.11
diff -u -r1.11 drm_os_freebsd.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h	24 Jan 2003 00:49:15 -0000	1.11
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h	3 Feb 2003 23:22:31 -0000
@@ -79,6 +79,7 @@
 #define DRM_STRUCTPROC		struct thread
 #define DRM_SPINTYPE		struct mtx
 #define DRM_SPININIT(l,name)	mtx_init(&l, name, NULL, MTX_DEF)
+#define DRM_SPINUNINIT(l)	mtx_destroy(&l)
 #define DRM_SPINLOCK(l)		mtx_lock(l)
 #define DRM_SPINUNLOCK(u)	mtx_unlock(u);
 #define DRM_CURRENTPID		curthread->td_proc->p_pid
@@ -87,6 +88,7 @@
 #define DRM_STRUCTPROC		struct proc
 #define DRM_SPINTYPE		struct simplelock
 #define DRM_SPININIT(l,name)	simple_lock_init(&l)
+#define DRM_SPINUNINIT(l,name)
 #define DRM_SPINLOCK(l)		simple_lock(l)
 #define DRM_SPINUNLOCK(u)	simple_unlock(u);
 #define DRM_CURRENTPID		curproc->p_pid
@@ -102,10 +104,18 @@
 #define DRM_MALLOC(size)	malloc( size, DRM(M_DRM), M_NOWAIT )
 #define DRM_FREE(pt)		free( pt, DRM(M_DRM) )
 #define DRM_VTOPHYS(addr)	vtophys(addr)
-#define DRM_READ8(addr)		*((volatile char *)(addr))
-#define DRM_READ32(addr)	*((volatile long *)(addr))
-#define DRM_WRITE8(addr, val)	*((volatile char *)(addr)) = (val)
-#define DRM_WRITE32(addr, val)	*((volatile long *)(addr)) = (val)
+
+/* Read/write from bus space, with byteswapping to le if necessary */
+#define DRM_READ8(map, offset)		*(volatile u_int8_t *) (((unsigned long)(map)->handle) + (offset))
+#define DRM_READ32(map, offset)		*(volatile u_int32_t *)(((unsigned long)(map)->handle) + (offset))
+#define DRM_WRITE8(map, offset, val)	*(volatile u_int8_t *) (((unsigned long)(map)->handle) + (offset)) = val
+#define DRM_WRITE32(map, offset, val)	*(volatile u_int32_t *)(((unsigned long)(map)->handle) + (offset)) = val
+/*
+#define DRM_READ8(map, offset)		bus_space_read_1(  (map)->iot, (map)->ioh, (offset) )
+#define DRM_READ32(map, offset)		bus_space_read_4(  (map)->iot, (map)->ioh, (offset) )
+#define DRM_WRITE8(map, offset, val)	bus_space_write_1( (map)->iot, (map)->ioh, (offset), (val) )
+#define DRM_WRITE32(map, offset, val)	bus_space_write_4( (map)->iot, (map)->ioh, (offset), (val) )
+*/
 #define DRM_AGP_FIND_DEVICE()	agp_find_device()
 #define DRM_ERR(v)		v
 
@@ -130,7 +140,7 @@
 do {								\
 	drm_map_list_entry_t *listentry;			\
 	TAILQ_FOREACH(listentry, dev->maplist, link) {		\
-		drm_map_t *map = listentry->map;		\
+		drm_local_map_t *map = listentry->map;		\
 		if (map->type == _DRM_SHM &&			\
 			map->flags & _DRM_CONTAINS_LOCK) {	\
 			dev_priv->sarea = map;			\
@@ -166,7 +176,7 @@
 	copyin(user, kern, size)
 /* Macros for userspace access with checking readability once */
 /* FIXME: can't find equivalent functionality for nocheck yet.
- * It's be slower than linux, but should be correct.
+ * It'll be slower than linux, but should be correct.
  */
 #define DRM_VERIFYAREA_READ( uaddr, size )		\
 	(!useracc((caddr_t)uaddr, size, VM_PROT_READ))
@@ -175,20 +185,13 @@
 #define DRM_GET_USER_UNCHECKED(val, uaddr)			\
 	((val) = fuword(uaddr), 0)
 
-/* From machine/bus_at386.h on i386 */
-#define DRM_READMEMORYBARRIER()					\
-do {									\
-   	__asm __volatile("lock; addl $0,0(%%esp)" : : : "memory");	\
-} while (0)
-
-#define DRM_WRITEMEMORYBARRIER()					\
-do {									\
-   	__asm __volatile("" : : : "memory");				\
-} while (0)
-
+#define DRM_WRITEMEMORYBARRIER( map )					\
+	bus_space_barrier((map)->iot, (map)->ioh, 0, (map)->size, 0);
+#define DRM_READMEMORYBARRIER( map )					\
+	bus_space_barrier((map)->iot, (map)->ioh, 0, (map)->size, BUS_SPACE_BARRIER_READ);
 
 #define PAGE_ALIGN(addr) round_page(addr)
- 
+
 #ifndef M_WAITOK		/* M_WAITOK (=0) name removed in -current */
 #define M_WAITOK 0
 #endif
@@ -206,7 +209,7 @@
 	char *name;
 } drm_chipinfo_t;
 
-#define cpu_to_le32(x) (x)
+#define cpu_to_le32(x) (x)	/* FIXME */
 
 typedef u_int32_t dma_addr_t;
 typedef u_int32_t atomic_t;
@@ -223,6 +226,23 @@
 #define atomic_sub(n, p)	atomic_subtract_int(p, n)
 
 /* Fake this */
+
+#if __FreeBSD_version < 500000
+/* The extra atomic functions from 5.0 haven't been merged to 4.x */
+static __inline int
+atomic_cmpset_int(int *dst, int old, int new)
+{
+	int s = splhigh();
+	if (*dst==old) {
+		*dst = new;
+		splx(s);
+		return 1;
+	}
+	splx(s);
+	return 0;
+}
+#endif
+
 static __inline atomic_t
 test_and_set_bit(int b, volatile void *p)
 {
@@ -283,20 +303,6 @@
 #define MODULE_DEPEND(a,b,c,d,e)	struct __hack
 
 #endif
-
-#define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock)
-#define _DRM_CAS(lock,old,new,__ret)				       \
-	do {							       \
-		int __dummy;	/* Can't mark eax as clobbered */      \
-		__asm__ __volatile__(				       \
-			"lock ; cmpxchg %4,%1\n\t"		       \
-			"setnz %0"				       \
-			: "=d" (__ret),				       \
-			  "=m" (__drm_dummy_lock(lock)),	       \
-			  "=a" (__dummy)			       \
-			: "2" (old),				       \
-			  "r" (new));				       \
-	} while (0)
 
 /* Redefinitions to make templating easy */
 #define wait_queue_head_t	atomic_t
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_netbsd.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_netbsd.h,v
retrieving revision 1.2
diff -u -r1.2 drm_os_netbsd.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_netbsd.h	5 Jul 2002 08:31:07 -0000	1.2
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_netbsd.h	3 Feb 2003 23:22:31 -0000
@@ -17,6 +17,7 @@
 #include <uvm/uvm.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
+#include <sys/lkm.h>
 /* For TIOCSPGRP/TIOCGPGRP */
 #include <sys/ttycom.h>
 
@@ -31,11 +32,9 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
  
-#include "drmvar.h"
-
 #define __REALLY_HAVE_AGP	__HAVE_AGP
 
-#define __REALLY_HAVE_MTRR	0
+#define __REALLY_HAVE_MTRR	1
 #define __REALLY_HAVE_SG	0
 
 #if __REALLY_HAVE_AGP
@@ -43,8 +42,9 @@
 #include <sys/agpio.h>
 #endif
 
-#define device_t struct device *
-extern struct cfdriver DRM(_cd);
+typedef drm_device_t *device_t;
+
+extern struct cfdriver DRM(cd);
 
 #if DRM_DEBUG
 #undef  DRM_DEBUG_CODE
@@ -57,31 +57,35 @@
 #define DRM_DEV_MODE	(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
 #define DRM_DEV_UID	0
 #define DRM_DEV_GID	0
-#define CDEV_MAJOR	90
+#define CDEV_MAJOR	34
 
 #define DRM_CURPROC		curproc
-#define DRM_STRUCTPROC	struct proc
+#define DRM_STRUCTPROC		struct proc
 #define DRM_SPINTYPE		struct simplelock
 #define DRM_SPININIT(l,name)	simple_lock_init(&l)
-#define DRM_SPINLOCK(l)	simple_lock(l)
+#define DRM_SPINUNINIT(l)
+#define DRM_SPINLOCK(l)		simple_lock(l)
 #define DRM_SPINUNLOCK(u)	simple_unlock(u);
-#define DRM_CURRENTPID       curproc->p_pid
+#define DRM_CURRENTPID		curproc->p_pid
 
 #define DRM_IOCTL_ARGS		dev_t kdev, u_long cmd, caddr_t data, int flags, DRM_STRUCTPROC *p
 #define DRM_LOCK		lockmgr(&dev->dev_lock, LK_EXCLUSIVE, NULL)
 #define DRM_UNLOCK 		lockmgr(&dev->dev_lock, LK_RELEASE, NULL)
 #define DRM_SUSER(p)		suser(p->p_ucred, &p->p_acflag)
 #define DRM_TASKQUEUE_ARGS	void *dev, int pending
-#define DRM_IRQ_ARGS		void *device
-#define DRM_DEVICE		drm_device_t *dev = device_lookup(&DRM(_cd), minor(kdev))
+#define DRM_IRQ_ARGS		void *arg
+#define DRM_DEVICE		drm_device_t *dev = device_lookup(&DRM(cd), minor(kdev))
 #define DRM_MALLOC(size)	malloc( size, DRM(M_DRM), M_NOWAIT )
-#define DRM_FREE(pt)		free( pt, DRM(M_DRM) )
+/* XXX Get netbsd to add a M_DRM malloc type. */
+#define DRM_FREE(pt)		free( pt, M_AGP )
 #define DRM_VTOPHYS(addr)	vtophys(addr)
-#define DRM_READ8(addr)	*((volatile char *)(addr))
-#define DRM_READ32(addr)	*((volatile long *)(addr))
-#define DRM_WRITE8(addr, val)	*((volatile char *)(addr)) = (val)
-#define DRM_WRITE32(addr, val)	*((volatile long *)(addr)) = (val)
-#define DRM_AGP_FIND_DEVICE()
+
+#define DRM_READ8(map, offset)		bus_space_read_1(  (map)->iot, (map)->ioh, (offset) )
+#define DRM_READ32(map, offset)		bus_space_read_4(  (map)->iot, (map)->ioh, (offset) )
+#define DRM_WRITE8(map, offset, val)	bus_space_write_1( (map)->iot, (map)->ioh, (offset), (val) )
+#define DRM_WRITE32(map, offset, val)	bus_space_write_4( (map)->iot, (map)->ioh, (offset), (val) )
+
+#define DRM_AGP_FIND_DEVICE()	agp_find_device(0)
 
 #define DRM_PRIV					\
 	drm_file_t	*priv	= (drm_file_t *) DRM(find_file_by_proc)(dev, p); \
@@ -104,7 +108,7 @@
 do {								\
 	drm_map_list_entry_t *listentry;			\
 	TAILQ_FOREACH(listentry, dev->maplist, link) {		\
-		drm_map_t *map = listentry->map;		\
+		drm_local_map_t *map = listentry->map;		\
 		if (map->type == _DRM_SHM &&			\
 			map->flags & _DRM_CONTAINS_LOCK) {	\
 			dev_priv->sarea = map;			\
@@ -113,7 +117,15 @@
 	}							\
 } while (0)
 
-#define return DRM_ERR(v)	return v;
+#define DRM_HZ hz
+
+#define DRM_WAIT_ON( ret, queue, timeout, condition )		\
+while (!condition) {						\
+	ret = tsleep( (void *)&(queue), PZERO | PCATCH, "drmwtq", (timeout) ); \
+	if ( ret )						\
+		return ret;					\
+}
+
 #define DRM_ERR(v)		v
 
 #define DRM_COPY_TO_USER_IOCTL(arg1, arg2, arg3) \
@@ -125,19 +137,12 @@
 #define DRM_COPY_FROM_USER(arg1, arg2, arg3) \
 	copyin(arg2, arg1, arg3)
 
-#define DRM_READMEMORYBARRIER \
-{												\
-   	int xchangeDummy;									\
-	DRM_DEBUG("%s\n", __FUNCTION__);							\
-   	__asm__ volatile(" push %%eax ; xchg %%eax, %0 ; pop %%eax" : : "m" (xchangeDummy));	\
-   	__asm__ volatile(" push %%eax ; push %%ebx ; push %%ecx ; push %%edx ;"			\
-			 " movl $0,%%eax ; cpuid ; pop %%edx ; pop %%ecx ; pop %%ebx ;"		\
-			 " pop %%eax" : /* no outputs */ :  /* no inputs */ );			\
-} while (0);
+#define DRM_WRITEMEMORYBARRIER( map )					\
+	bus_space_barrier((map)->iot, (map)->ioh, 0, (map)->size, 0);
+#define DRM_READMEMORYBARRIER( map )					\
+	bus_space_barrier((map)->iot, (map)->ioh, 0, (map)->size, BUS_SPACE_BARRIER_READ);
 
-#define DRM_WRITEMEMORYBARRIER DRM_READMEMORYBARRIER
-
-#define DRM_WAKEUP(w) wakeup(w)
+#define DRM_WAKEUP(w) wakeup((void *)w)
 #define DRM_WAKEUP_INT(w) wakeup(w)
 
 #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
@@ -150,8 +155,10 @@
 	char *name;
 } drm_chipinfo_t;
 
+#define cpu_to_le32(x) (x)	/* FIXME */
+
 typedef u_int32_t dma_addr_t;
-typedef volatile u_int32_t atomic_t;
+typedef volatile long atomic_t;
 typedef u_int32_t cycles_t;
 typedef u_int32_t spinlock_t;
 typedef u_int32_t u32;
@@ -160,20 +167,35 @@
 typedef dev_type_ioctl(d_ioctl_t);
 typedef vaddr_t vm_offset_t;
 
+/* FIXME */
 #define atomic_set(p, v)	(*(p) = (v))
 #define atomic_read(p)		(*(p))
-#define atomic_inc(p)		atomic_add_int(p, 1)
-#define atomic_dec(p)		atomic_subtract_int(p, 1)
-#define atomic_add(n, p)	atomic_add_int(p, n)
-#define atomic_sub(n, p)	atomic_subtract_int(p, n)
+#define atomic_inc(p)		(*(p) += 1)
+#define atomic_dec(p)		(*(p) -= 1)
+#define atomic_add(n, p)	(*(p) += (n))
+#define atomic_sub(n, p)	(*(p) -= (n))
 
-/* FIXME: Is NetBSD's kernel non-reentrant? */
+/* FIXME */
 #define atomic_add_int(p, v)      *(p) += v
 #define atomic_subtract_int(p, v) *(p) -= v
 #define atomic_set_int(p, bits)   *(p) |= (bits)
 #define atomic_clear_int(p, bits) *(p) &= ~(bits)
 
 /* Fake this */
+
+static __inline int
+atomic_cmpset_int(__volatile__ int *dst, int old, int new)
+{
+	int s = splhigh();
+	if (*dst==old) {
+		*dst = new;
+		splx(s);
+		return 1;
+	}
+	splx(s);
+	return 0;
+}
+
 static __inline atomic_t
 test_and_set_bit(int b, atomic_t *p)
 {
@@ -222,20 +244,6 @@
 
 #define spldrm()		spltty()
 #define jiffies			hardclock_ticks
-
-#define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock)
-#define _DRM_CAS(lock,old,new,__ret)				       \
-	do {							       \
-		int __dummy;	/* Can't mark eax as clobbered */      \
-		__asm__ __volatile__(				       \
-			"lock ; cmpxchg %4,%1\n\t"		       \
-			"setnz %0"				       \
-			: "=d" (__ret),				       \
-			  "=m" (__drm_dummy_lock(lock)),	       \
-			  "=a" (__dummy)			       \
-			: "2" (old),				       \
-			  "r" (new));				       \
-	} while (0)
 
 /* Redefinitions to make templating easy */
 #define wait_queue_head_t	atomic_t
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_scatter.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_scatter.h,v
retrieving revision 1.3
diff -u -r1.3 drm_scatter.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_scatter.h	5 Jul 2002 08:31:07 -0000	1.3
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_scatter.h	3 Feb 2003 23:22:33 -0000
@@ -40,9 +40,6 @@
 	DRM(free)( entry->busaddr,
 		   entry->pages * sizeof(*entry->busaddr),
 		   DRM_MEM_PAGES );
-	DRM(free)( entry->pagelist,
-		   entry->pages * sizeof(*entry->pagelist),
-		   DRM_MEM_PAGES );
 	DRM(free)( entry,
 		   sizeof(*entry),
 		   DRM_MEM_SGLISTS );
@@ -73,21 +70,10 @@
 	DRM_DEBUG( "sg size=%ld pages=%ld\n", request.size, pages );
 
 	entry->pages = pages;
-	entry->pagelist = DRM(alloc)( pages * sizeof(*entry->pagelist),
-				     DRM_MEM_PAGES );
-	if ( !entry->pagelist ) {
-		DRM(free)( entry, sizeof(*entry), DRM_MEM_SGLISTS );
-		return ENOMEM;
-	}
-
-	bzero(entry->pagelist, pages * sizeof(*entry->pagelist));
 
 	entry->busaddr = DRM(alloc)( pages * sizeof(*entry->busaddr),
 				     DRM_MEM_PAGES );
 	if ( !entry->busaddr ) {
-		DRM(free)( entry->pagelist,
-			   entry->pages * sizeof(*entry->pagelist),
-			   DRM_MEM_PAGES );
 		DRM(free)( entry,
 			   sizeof(*entry),
 			   DRM_MEM_SGLISTS );
@@ -100,9 +86,6 @@
 		DRM(free)( entry->busaddr,
 			   entry->pages * sizeof(*entry->busaddr),
 			   DRM_MEM_PAGES );
-		DRM(free)( entry->pagelist,
-			   entry->pages * sizeof(*entry->pagelist),
-			   DRM_MEM_PAGES );
 		DRM(free)( entry,
 			   sizeof(*entry),
 			   DRM_MEM_SGLISTS );
@@ -123,46 +106,6 @@
 			   sizeof(request) );
 
 	dev->sg = entry;
-
-#if DEBUG_SCATTER
-	/* Verify that each page points to its virtual address, and vice
-	 * versa.
-	 */
-	{
-	int error = 0;
-
-	for ( i = 0 ; i < pages ; i++ ) {
-		unsigned long *tmp;
-
-		tmp = page_address( entry->pagelist[i] );
-		for ( j = 0 ;
-		      j < PAGE_SIZE / sizeof(unsigned long) ;
-		      j++, tmp++ ) {
-			*tmp = 0xcafebabe;
-		}
-		tmp = (unsigned long *)((u8 *)entry->virtual +
-					(PAGE_SIZE * i));
-		for( j = 0 ;
-		     j < PAGE_SIZE / sizeof(unsigned long) ;
-		     j++, tmp++ ) {
-			if ( *tmp != 0xcafebabe && error == 0 ) {
-				error = 1;
-				DRM_ERROR( "Scatter allocation error, "
-					   "pagelist does not match "
-					   "virtual mapping\n" );
-			}
-		}
-		tmp = page_address( entry->pagelist[i] );
-		for(j = 0 ;
-		    j < PAGE_SIZE / sizeof(unsigned long) ;
-		    j++, tmp++) {
-			*tmp = 0;
-		}
-	}
-	if (error == 0)
-		DRM_ERROR( "Scatter allocation matches pagelist\n" );
-	}
-#endif
 
 	return 0;
 
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_sysctl.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_sysctl.h,v
retrieving revision 1.4
diff -u -r1.4 drm_sysctl.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_sysctl.h	29 Sep 2002 22:47:08 -0000	1.4
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_sysctl.h	3 Feb 2003 23:22:36 -0000
@@ -125,7 +125,7 @@
 static int DRM(_vm_info)DRM_SYSCTL_HANDLER_ARGS
 {
 	drm_device_t *dev = arg1;
-	drm_map_t    *map;
+	drm_local_map_t    *map;
 	drm_map_list_entry_t    *listentry;
 	const char   *types[] = { "FB", "REG", "SHM" };
 	const char   *type;
@@ -203,7 +203,7 @@
 				     q->read_queue ? 'r':'-',
 				     q->write_queue ? 'w':'-',
 				     q->flush_queue ? 'f':'-',
-				     DRM_BUFCOUNT(&q->waitlist),
+				     (int)DRM_BUFCOUNT(&q->waitlist),
 				     atomic_read(&q->total_flushed),
 				     atomic_read(&q->total_queued),
 				     atomic_read(&q->total_locks));
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_vm.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_vm.h,v
retrieving revision 1.3
diff -u -r1.3 drm_vm.h
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_vm.h	5 Jul 2002 08:31:08 -0000	1.3
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_vm.h	3 Feb 2003 23:22:36 -0000
@@ -27,7 +27,7 @@
 #endif
 {
 	DRM_DEVICE;
-	drm_map_t	*map	= NULL;
+	drm_local_map_t *map	= NULL;
 	drm_map_list_entry_t *listentry=NULL;
 	drm_file_t *priv;
 
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga_drv.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga_drv.c,v
retrieving revision 1.2
diff -u -r1.2 mga_drv.c
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga_drv.c	5 Jul 2002 08:31:08 -0000	1.2
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga_drv.c	3 Feb 2003 23:22:36 -0000
@@ -29,8 +29,6 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
-#include <sys/types.h>
-
 #include "mga.h"
 #include "drmP.h"
 #include "drm.h"
@@ -63,4 +61,8 @@
 #include "drm_vm.h"
 #include "drm_sysctl.h"
 
+#ifdef __FreeBSD__
 DRIVER_MODULE(mga, pci, mga_driver, mga_devclass, 0, 0);
+#elif defined(__NetBSD__)
+CFDRIVER_DECL(mga, DV_TTY, NULL);
+#endif
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128_drv.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128_drv.c,v
retrieving revision 1.2
diff -u -r1.2 r128_drv.c
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128_drv.c	5 Jul 2002 08:31:08 -0000	1.2
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128_drv.c	3 Feb 2003 23:22:36 -0000
@@ -29,9 +29,6 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
-
-#include <sys/types.h>
-
 #include "r128.h"
 #include "drmP.h"
 #include "drm.h"
@@ -83,4 +80,8 @@
 #include "drm_scatter.h"
 #endif
 
+#ifdef __FreeBSD__
 DRIVER_MODULE(r128, pci, r128_driver, r128_devclass, 0, 0);
+#elif defined(__NetBSD__)
+CFDRIVER_DECL(r128, DV_TTY, NULL);
+#endif /* __FreeBSD__ */
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon_drv.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon_drv.c,v
retrieving revision 1.3
diff -u -r1.3 radeon_drv.c
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon_drv.c	26 Aug 2002 22:16:18 -0000	1.3
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon_drv.c	3 Feb 2003 23:22:36 -0000
@@ -27,8 +27,6 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
-#include <sys/types.h>
-
 #include "radeon.h"
 #include "drmP.h"
 #include "drm.h"
@@ -38,21 +36,40 @@
 #include "ati_pcigart.h"
 #endif
 
-/* List acquired from http://www.yourvote.com/pci/pcihdr.h and xc/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
- * Please report to eta@lclark.edu inaccuracies or if a chip you have works that is marked unsupported here.
- */
 drm_chipinfo_t DRM(devicelist)[] = {
+	{0x1002, 0x4242, 1, "ATI Radeon BB AIW 8500DV (AGP)"},
+	{0x1002, 0x4336, 1, "ATI Radeon Mobility"},
+	{0x1002, 0x4337, 1, "ATI Radeon IGP 340"},
+	{0x1002, 0x4964, 1, "ATI Radeon Id 9000"},
+	{0x1002, 0x4965, 1, "ATI Radeon Ie 9000"},
+	{0x1002, 0x4966, 1, "ATI Radeon If 9000"},
+	{0x1002, 0x4967, 1, "ATI Radeon Ig 9000"},
+	{0x1002, 0x496e, 1, "ATI Radeon Ig 9000"},
 	{0x1002, 0x4C57, 1, "ATI Radeon LW Mobility 7 (AGP)"},
+	{0x1002, 0x4C58, 1, "ATI Radeon LX Mobility 7 (AGP)"},
 	{0x1002, 0x4C59, 1, "ATI Radeon LY Mobility 6 (AGP)"},
 	{0x1002, 0x4C5A, 1, "ATI Radeon LZ Mobility 6 (AGP)"},
-	{0x1002, 0x5144, 1, "ATI Radeon QD (AGP)"},
-	{0x1002, 0x5145, 1, "ATI Radeon QE (AGP)"},
-	{0x1002, 0x5146, 1, "ATI Radeon QF (AGP)"},
-	{0x1002, 0x5147, 1, "ATI Radeon QG (AGP)"},
+	{0x1002, 0x4C64, 1, "ATI Radeon Ld Mobility 9000 (AGP)"},
+	{0x1002, 0x4C65, 1, "ATI Radeon Le Mobility 9000 (AGP)"},
+	{0x1002, 0x4C66, 1, "ATI Radeon Lf Mobility 9000 (AGP)"},
+	{0x1002, 0x4C67, 1, "ATI Radeon Lg Mobility 9000 (AGP)"},
+	{0x1002, 0x5144, 1, "ATI Radeon QD R100 (AGP)"},
+	{0x1002, 0x5145, 1, "ATI Radeon QE R100 (AGP)"},
+	{0x1002, 0x5146, 1, "ATI Radeon QF R100 (AGP)"},
+	{0x1002, 0x5147, 1, "ATI Radeon QG R100 (AGP)"},
+	{0x1002, 0x5148, 1, "ATI Radeon QH FireGL 8x00 (AGP)"},
+	{0x1002, 0x5149, 1, "ATI Radeon QI R200"},
+	{0x1002, 0x514A, 1, "ATI Radeon QJ R200"},
+	{0x1002, 0x514B, 1, "ATI Radeon QK R200"},
+	{0x1002, 0x514C, 1, "ATI Radeon QL 8500 (AGP)"},
 	{0x1002, 0x5157, 1, "ATI Radeon QW 7500 (AGP)"},
+	{0x1002, 0x5158, 1, "ATI Radeon QX 7500 (AGP)"},
 	{0x1002, 0x5159, 1, "ATI Radeon QY VE (AGP)"},
 	{0x1002, 0x515A, 1, "ATI Radeon QZ VE (AGP)"},
-	{0x1002, 0x514C, 1, "ATI Radeon QL 8500 (AGP)"},
+	{0x1002, 0x5168, 1, "ATI Radeon Qh R200"},
+	{0x1002, 0x5169, 1, "ATI Radeon Qi R200"},
+	{0x1002, 0x516A, 1, "ATI Radeon Qj R200"},
+	{0x1002, 0x516B, 1, "ATI Radeon Qk R200"},
 	{0, 0, 0, NULL}
 };
 
@@ -74,4 +91,8 @@
 #include "drm_scatter.h"
 #endif
 
+#ifdef __FreeBSD__
 DRIVER_MODULE(DRIVER_NAME, pci, DRM(driver), DRM(devclass), 0, 0);
+#elif defined(__NetBSD__)
+CFDRIVER_DECL(radeon, DV_TTY, NULL);
+#endif /* __FreeBSD__ */
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx_drv.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx_drv.c,v
retrieving revision 1.2
diff -u -r1.2 tdfx_drv.c
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx_drv.c	5 Jul 2002 08:31:08 -0000	1.2
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx_drv.c	3 Feb 2003 23:22:36 -0000
@@ -30,9 +30,6 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
-
-#include <sys/types.h>
-
 #include "tdfx.h"
 #include "drmP.h"
 
@@ -96,4 +93,6 @@
 
 #ifdef __FreeBSD__
 DRIVER_MODULE(tdfx, pci, tdfx_driver, tdfx_devclass, 0, 0);
+#elif defined(__NetBSD__)
+CFDRIVER_DECL(tdfx, DV_TTY, NULL);
 #endif /* __FreeBSD__ */
Index: programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v
retrieving revision 1.40
diff -u -r1.40 xf86drm.c
--- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c	25 Nov 2002 16:03:20 -0000	1.40
+++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c	3 Feb 2003 23:22:42 -0000
@@ -84,13 +84,16 @@
 
 #include "xf86drm.h"
 
-#ifndef DRM_MAJOR
-#define DRM_MAJOR 226		/* Linux */
+#ifdef __FreeBSD__
+#define DRM_MAJOR 145
+#endif
+
+#ifdef __NetBSD__
+#define DRM_MAJOR 34
 #endif
 
-#ifndef __linux__
-#undef  DRM_MAJOR
-#define DRM_MAJOR 145		/* Should set in drm.h for *BSD */
+#ifndef DRM_MAJOR
+#define DRM_MAJOR 226		/* Linux */
 #endif
 
 #ifndef DRM_MAX_MINOR
Index: programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v
retrieving revision 1.56
diff -u -r1.56 drmP.h
--- programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h	11 Jan 2003 20:58:20 -0000	1.56
+++ programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h	3 Feb 2003 23:22:46 -0000
@@ -255,6 +255,7 @@
  		}							\
 	}								\
 } while(0)
+#define DRM_DROP_MAP(_map)
 
 				/* Internal types and structures */
 #define DRM_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
@@ -527,6 +528,8 @@
 } drm_vbl_sig_t;
 
 #endif
+
+typedef drm_map_t drm_local_map_t;
 
 typedef struct drm_device {
 	const char	  *name;	/* Simple driver name		   */
Index: programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_os_linux.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_os_linux.h,v
retrieving revision 1.5
diff -u -r1.5 drm_os_linux.h
--- programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_os_linux.h	9 Oct 2002 16:29:01 -0000	1.5
+++ programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_os_linux.h	3 Feb 2003 23:22:46 -0000
@@ -7,12 +7,12 @@
 #define DRM_ERR(d)			-(d)
 #define DRM_CURRENTPID			current->pid
 #define DRM_UDELAY(d)			udelay(d)
-#define DRM_READ8(addr)			readb(addr)
-#define DRM_READ32(addr)		readl(addr)
-#define DRM_WRITE8(addr, val)		writeb(val, addr)
-#define DRM_WRITE32(addr, val)		writel(val, addr)
-#define DRM_READMEMORYBARRIER()		mb()
-#define DRM_WRITEMEMORYBARRIER()	wmb()
+#define DRM_READ8(map, offset)		readb(((unsigned long)(map)->handle) + (offset))
+#define DRM_READ32(map, offset)		readl(((unsigned long)(map)->handle) + (offset))
+#define DRM_WRITE8(map, offset, val)	writeb(val, ((unsigned long)(map)->handle) + (offset))
+#define DRM_WRITE32(map, offset, val)	writel(val, ((unsigned long)(map)->handle) + (offset))
+#define DRM_READMEMORYBARRIER(map)	mb()
+#define DRM_WRITEMEMORYBARRIER(map)	wmb()
 #define DRM_DEVICE	drm_file_t	*priv	= filp->private_data; \
 			drm_device_t	*dev	= priv->dev
 
Index: programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/mga_drv.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/mga_drv.h,v
retrieving revision 1.5
diff -u -r1.5 mga_drv.h
--- programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/mga_drv.h	30 Oct 2002 06:10:33 -0000	1.5
+++ programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/mga_drv.h	3 Feb 2003 23:22:59 -0000
@@ -90,14 +90,14 @@
 	unsigned int texture_offset;
 	unsigned int texture_size;
 
-	drm_map_t *sarea;
-	drm_map_t *fb;
-	drm_map_t *mmio;
-	drm_map_t *status;
-	drm_map_t *warp;
-	drm_map_t *primary;
-	drm_map_t *buffers;
-	drm_map_t *agp_textures;
+	drm_local_map_t *sarea;
+	drm_local_map_t *fb;
+	drm_local_map_t *mmio;
+	drm_local_map_t *status;
+	drm_local_map_t *warp;
+	drm_local_map_t *primary;
+	drm_local_map_t *buffers;
+	drm_local_map_t *agp_textures;
 } drm_mga_private_t;
 
 				/* mga_dma.c */
@@ -131,16 +131,15 @@
 extern int mga_warp_install_microcode( drm_mga_private_t *dev_priv );
 extern int mga_warp_init( drm_mga_private_t *dev_priv );
 
-#define mga_flush_write_combine()	DRM_WRITEMEMORYBARRIER()
-
+#define mga_flush_write_combine()	DRM_WRITEMEMORYBARRIER(dev_priv->primary)
 
+#if defined(__linux__) && defined(__alpha__)
 #define MGA_BASE( reg )		((unsigned long)(dev_priv->mmio->handle))
 #define MGA_ADDR( reg )		(MGA_BASE(reg) + reg)
 
 #define MGA_DEREF( reg )	*(volatile u32 *)MGA_ADDR( reg )
 #define MGA_DEREF8( reg )	*(volatile u8 *)MGA_ADDR( reg )
 
-#ifdef __alpha__
 #define MGA_READ( reg )		(_MGA_READ((u32 *)MGA_ADDR(reg)))
 #define MGA_READ8( reg )	(_MGA_READ((u8 *)MGA_ADDR(reg)))
 #define MGA_WRITE( reg, val )	do { DRM_WRITEMEMORYBARRIER(); MGA_DEREF( reg ) = val; } while (0)
@@ -151,12 +150,11 @@
 	DRM_READMEMORYBARRIER();
 	return *(volatile u32 *)addr;
 }
-
 #else
-#define MGA_READ( reg )		MGA_DEREF( reg )
-#define MGA_READ8( reg )	MGA_DEREF8( reg )
-#define MGA_WRITE( reg, val )	do { MGA_DEREF( reg ) = val; } while (0)
-#define MGA_WRITE8( reg, val )  do { MGA_DEREF8( reg ) = val; } while (0)
+#define MGA_READ8( reg )	DRM_READ8(dev_priv->mmio, (reg))
+#define MGA_READ( reg )		DRM_READ32(dev_priv->mmio, (reg))
+#define MGA_WRITE8( reg, val )  DRM_WRITE8(dev_priv->mmio, (reg), (val))
+#define MGA_WRITE( reg, val )	DRM_WRITE32(dev_priv->mmio, (reg), (val))
 #endif
 
 #define DWGREG0 	0x1c00
Index: programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_cce.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_cce.c,v
retrieving revision 1.3
diff -u -r1.3 r128_cce.c
--- programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_cce.c	29 Aug 2002 07:34:49 -0000	1.3
+++ programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_cce.c	3 Feb 2003 23:23:04 -0000
@@ -579,6 +579,7 @@
 		(dev_priv->ring.size / sizeof(u32)) - 1;
 
 	dev_priv->ring.high_mark = 128;
+	dev_priv->ring.ring_rptr = dev_priv->ring_rptr;
 
 	dev_priv->sarea_priv->last_frame = 0;
 	R128_WRITE( R128_LAST_FRAME_REG, dev_priv->sarea_priv->last_frame );
Index: programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_drv.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_drv.h,v
retrieving revision 1.4
diff -u -r1.4 r128_drv.h
--- programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_drv.h	30 Oct 2002 06:10:34 -0000	1.4
+++ programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/r128_drv.h	3 Feb 2003 23:23:18 -0000
@@ -34,8 +34,8 @@
 #ifndef __R128_DRV_H__
 #define __R128_DRV_H__
 
-#define GET_RING_HEAD(ring)		DRM_READ32(  (volatile u32 *) (ring)->head )
-#define SET_RING_HEAD(ring,val)		DRM_WRITE32( (volatile u32 *) (ring)->head, (val) )
+#define GET_RING_HEAD(ring)		DRM_READ32(  (ring)->ring_rptr, 0 ) /* (ring)->head */
+#define SET_RING_HEAD(ring,val)		DRM_WRITE32( (ring)->ring_rptr, 0, (val) ) /* (ring)->head */
 
 typedef struct drm_r128_freelist {
    	unsigned int age;
@@ -56,6 +56,7 @@
 	int space;
 
 	int high_mark;
+	drm_local_map_t *ring_rptr;
 } drm_r128_ring_buffer_t;
 
 typedef struct drm_r128_private {
@@ -98,13 +99,13 @@
 	u32 depth_pitch_offset_c;
 	u32 span_pitch_offset_c;
 
-	drm_map_t *sarea;
-	drm_map_t *fb;
-	drm_map_t *mmio;
-	drm_map_t *cce_ring;
-	drm_map_t *ring_rptr;
-	drm_map_t *buffers;
-	drm_map_t *agp_textures;
+	drm_local_map_t *sarea;
+	drm_local_map_t *fb;
+	drm_local_map_t *mmio;
+	drm_local_map_t *cce_ring;
+	drm_local_map_t *ring_rptr;
+	drm_local_map_t *buffers;
+	drm_local_map_t *agp_textures;
 } drm_r128_private_t;
 
 typedef struct drm_r128_buf_priv {
@@ -370,15 +371,10 @@
 
 #define R128_PERFORMANCE_BOXES		0
 
-
-#define R128_BASE(reg)		((unsigned long)(dev_priv->mmio->handle))
-#define R128_ADDR(reg)		(R128_BASE( reg ) + reg)
-
-#define R128_READ(reg)		DRM_READ32(  (volatile u32 *) R128_ADDR(reg) )
-#define R128_WRITE(reg,val)	DRM_WRITE32( (volatile u32 *) R128_ADDR(reg), (val) )
-
-#define R128_READ8(reg)		DRM_READ8(  (volatile u8 *) R128_ADDR(reg) )
-#define R128_WRITE8(reg,val)	DRM_WRITE8( (volatile u8 *) R128_ADDR(reg), (val) )
+#define R128_READ(reg)		DRM_READ32(  dev_priv->mmio, (reg) )
+#define R128_WRITE(reg,val)	DRM_WRITE32( dev_priv->mmio, (reg), (val) )
+#define R128_READ8(reg)		DRM_READ8(   dev_priv->mmio, (reg) )
+#define R128_WRITE8(reg,val)	DRM_WRITE8(  dev_priv->mmio, (reg), (val) )
 
 #define R128_WRITE_PLL(addr,val)					\
 do {									\
@@ -453,7 +449,7 @@
 #if defined(__powerpc__)
 #define r128_flush_write_combine()	(void) GET_RING_HEAD( &dev_priv->ring )
 #else
-#define r128_flush_write_combine()	DRM_WRITEMEMORYBARRIER()
+#define r128_flush_write_combine()	DRM_WRITEMEMORYBARRIER(dev_priv->ring_rptr)
 #endif
 
 
Index: programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_cp.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_cp.c,v
retrieving revision 1.17
diff -u -r1.17 radeon_cp.c
--- programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_cp.c	16 Jan 2003 06:20:44 -0000	1.17
+++ programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_cp.c	3 Feb 2003 23:23:58 -0000
@@ -926,11 +926,11 @@
 	RADEON_WRITE( RADEON_SCRATCH_UMSK, 0x7 );
 
 	/* Writeback doesn't seem to work everywhere, test it first */
-	DRM_WRITE32( &dev_priv->scratch[1], 0 );
+	DRM_WRITE32( dev_priv->ring_rptr, RADEON_SCRATCHOFF(1), 0 );
 	RADEON_WRITE( RADEON_SCRATCH_REG1, 0xdeadbeef );
 
 	for ( tmp = 0 ; tmp < dev_priv->usec_timeout ; tmp++ ) {
-		if ( DRM_READ32( &dev_priv->scratch[1] ) == 0xdeadbeef )
+		if ( DRM_READ32( dev_priv->ring_rptr, RADEON_SCRATCHOFF(1) ) == 0xdeadbeef )
 			break;
 		DRM_UDELAY( 1 );
 	}
@@ -1217,6 +1217,7 @@
 		(dev_priv->ring.size / sizeof(u32)) - 1;
 
 	dev_priv->ring.high_mark = RADEON_RING_HIGH_MARK;
+	dev_priv->ring.ring_rptr = dev_priv->ring_rptr;
 
 #if __REALLY_HAVE_SG
 	if ( dev_priv->is_pci ) {
@@ -1542,7 +1543,7 @@
 	drm_buf_t *buf;
 	int i, t;
 	int start;
-	u32 done_age = DRM_READ32(&dev_priv->scratch[1]);
+	u32 done_age = DRM_READ32(dev_priv->ring_rptr, RADEON_SCRATCHOFF(1));
 
 	if ( ++dev_priv->last_buf >= dma->buf_count )
 		dev_priv->last_buf = 0;
Index: programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drm.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drm.h,v
retrieving revision 1.9
diff -u -r1.9 radeon_drm.h
--- programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drm.h	29 Oct 2002 20:29:05 -0000	1.9
+++ programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drm.h	3 Feb 2003 23:24:01 -0000
@@ -396,7 +396,7 @@
 	enum {
 		RADEON_INIT_CP    = 0x01,
 		RADEON_CLEANUP_CP = 0x02,
-		RADEON_INIT_R200_CP = 0x03,	
+		RADEON_INIT_R200_CP = 0x03
 	} func;
 	unsigned long sarea_priv_offset;
 	int is_pci;
Index: programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drv.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drv.h,v
retrieving revision 1.12
diff -u -r1.12 radeon_drv.h
--- programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drv.h	2 Jan 2003 18:38:07 -0000	1.12
+++ programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/radeon_drv.h	3 Feb 2003 23:24:03 -0000
@@ -31,8 +31,8 @@
 #ifndef __RADEON_DRV_H__
 #define __RADEON_DRV_H__
 
-#define GET_RING_HEAD(ring)		DRM_READ32(  (volatile u32 *) (ring)->head )
-#define SET_RING_HEAD(ring,val)		DRM_WRITE32( (volatile u32 *) (ring)->head , (val))
+#define GET_RING_HEAD(ring)		DRM_READ32(  (ring)->ring_rptr, 0 ) /* (ring)->head */
+#define SET_RING_HEAD(ring,val)		DRM_WRITE32( (ring)->ring_rptr, 0, (val) ) /* (ring)->head */
 
 typedef struct drm_radeon_freelist {
    	unsigned int age;
@@ -53,6 +53,7 @@
 	int space;
 
 	int high_mark;
+	drm_local_map_t *ring_rptr;
 } drm_radeon_ring_buffer_t;
 
 typedef struct drm_radeon_depth_clear_t {
@@ -126,13 +127,13 @@
 
 	drm_radeon_depth_clear_t depth_clear;
 
-	drm_map_t *sarea;
-	drm_map_t *fb;
-	drm_map_t *mmio;
-	drm_map_t *cp_ring;
-	drm_map_t *ring_rptr;
-	drm_map_t *buffers;
-	drm_map_t *agp_textures;
+	drm_local_map_t *sarea;
+	drm_local_map_t *fb;
+	drm_local_map_t *mmio;
+	drm_local_map_t *cp_ring;
+	drm_local_map_t *ring_rptr;
+	drm_local_map_t *buffers;
+	drm_local_map_t *agp_textures;
 
 	struct mem_block *agp_heap;
 	struct mem_block *fb_heap;
@@ -267,8 +268,10 @@
 #define RADEON_SCRATCH_UMSK		0x0770
 #define RADEON_SCRATCH_ADDR		0x0774
 
+#define RADEON_SCRATCHOFF( x )		(RADEON_SCRATCH_REG_OFFSET + 4*(x))
+
 #define GET_SCRATCH( x )	(dev_priv->writeback_works			\
-				? DRM_READ32( &dev_priv->scratch[(x)] )		\
+				? DRM_READ32( dev_priv->ring_rptr, RADEON_SCRATCHOFF(x) ) \
 				: RADEON_READ( RADEON_SCRATCH_REG0 + 4*(x) ) )
 
 
@@ -687,15 +690,10 @@
 
 #define RADEON_RING_HIGH_MARK		128
 
-
-#define RADEON_BASE(reg)	((unsigned long)(dev_priv->mmio->handle))
-#define RADEON_ADDR(reg)	(RADEON_BASE( reg ) + reg)
-
-#define RADEON_READ(reg)	DRM_READ32(  (volatile u32 *) RADEON_ADDR(reg) )
-#define RADEON_WRITE(reg,val)	DRM_WRITE32( (volatile u32 *) RADEON_ADDR(reg), (val) )
-
-#define RADEON_READ8(reg)	DRM_READ8(  (volatile u8 *) RADEON_ADDR(reg) )
-#define RADEON_WRITE8(reg,val)	DRM_WRITE8( (volatile u8 *) RADEON_ADDR(reg), (val) )
+#define RADEON_READ(reg)	DRM_READ32(  dev_priv->mmio, (reg) )
+#define RADEON_WRITE(reg,val)	DRM_WRITE32( dev_priv->mmio, (reg), (val) )
+#define RADEON_READ8(reg)	DRM_READ8(  dev_priv->mmio, (reg) )
+#define RADEON_WRITE8(reg,val)	DRM_WRITE8( dev_priv->mmio, (reg), (val) )
 
 #define RADEON_WRITE_PLL( addr, val )					\
 do {									\
@@ -827,7 +825,7 @@
 #if defined(__powerpc__)
 #define radeon_flush_write_combine()	(void) GET_RING_HEAD( &dev_priv->ring )
 #else
-#define radeon_flush_write_combine()	DRM_WRITEMEMORYBARRIER()
+#define radeon_flush_write_combine()	DRM_WRITEMEMORYBARRIER( dev_priv->ring_rtpr )
 #endif