Remove dev->agp_buffer_token, linux needs it, we do not.

6 files changed, 0 insertions, 22 deletions

diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index cc67e60ac3f..6d41848b55c 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -572,7 +572,6 @@ struct drm_device {
 	drm_sg_mem_t		*sg;  /* Scatter gather memory */
 	atomic_t		*ctx_bitmap;
 	void			*dev_private;
-	unsigned int		 agp_buffer_token;
 	drm_local_map_t		*agp_buffer_map;
 
 	u_int		  drw_no;
diff --git a/sys/dev/pci/drm/mach64_dma.c b/sys/dev/pci/drm/mach64_dma.c
index 561f06337ca..f0c58f8bc0f 100644
--- a/sys/dev/pci/drm/mach64_dma.c
+++ b/sys/dev/pci/drm/mach64_dma.c
@@ -1078,7 +1078,6 @@ static int mach64_do_dma_init(struct drm_device * dev, drm_mach64_init_t * init)
 			mach64_do_cleanup_dma(dev);
 			return ENOMEM;
 		}
-		dev->agp_buffer_token = init->buffers_offset;
 		dev->agp_buffer_map =
 		    drm_core_findmap(dev, init->buffers_offset);
 		if (!dev->agp_buffer_map) {
diff --git a/sys/dev/pci/drm/mga_dma.c b/sys/dev/pci/drm/mga_dma.c
index fd3db6d6ef0..a7a941af2c2 100644
--- a/sys/dev/pci/drm/mga_dma.c
+++ b/sys/dev/pci/drm/mga_dma.c
@@ -538,22 +538,6 @@ static int mga_do_agp_dma_bootstrap(struct drm_device *dev,
 		return err;
 	}
 
-#ifdef __linux__
-	{
-		struct drm_map_list *_entry;
-		unsigned long agp_token = 0;
-
-		list_for_each_entry(_entry, &dev->maplist, head) {
-			if (_entry->map == dev->agp_buffer_map)
-				agp_token = _entry->user_token;
-		}
-		if (!agp_token)
-			return EFAULT;
-
-		dev->agp_buffer_token = agp_token;
-	}
-#endif
-
 	offset += secondary_size;
 	err = drm_addmap(dev, offset, agp_size - offset,
 			 _DRM_AGP, 0, & dev_priv->agp_textures);
@@ -845,7 +829,6 @@ static int mga_do_init_dma(struct drm_device * dev, drm_mga_init_t * init)
 			DRM_ERROR("failed to find primary dma region!\n");
 			return EINVAL;
 		}
-		dev->agp_buffer_token = init->buffers_offset;
 		dev->agp_buffer_map =
 			drm_core_findmap(dev, init->buffers_offset);
 		if (!dev->agp_buffer_map) {
diff --git a/sys/dev/pci/drm/r128_cce.c b/sys/dev/pci/drm/r128_cce.c
index 2bc5efe32ce..d000b24cac2 100644
--- a/sys/dev/pci/drm/r128_cce.c
+++ b/sys/dev/pci/drm/r128_cce.c
@@ -483,7 +483,6 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
 		r128_do_cleanup_cce(dev);
 		return EINVAL;
 	}
-	dev->agp_buffer_token = init->buffers_offset;
 	dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
 	if (!dev->agp_buffer_map) {
 		DRM_ERROR("could not find dma buffer region!\n");
diff --git a/sys/dev/pci/drm/radeon_cp.c b/sys/dev/pci/drm/radeon_cp.c
index 599146b994f..78d356689a0 100644
--- a/sys/dev/pci/drm/radeon_cp.c
+++ b/sys/dev/pci/drm/radeon_cp.c
@@ -1012,7 +1012,6 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
 		radeon_do_cleanup_cp(dev);
 		return EINVAL;
 	}
-	dev->agp_buffer_token = init->buffers_offset;
 	dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
 	if (!dev->agp_buffer_map) {
 		DRM_ERROR("could not find dma buffer region!\n");
diff --git a/sys/dev/pci/drm/savage_bci.c b/sys/dev/pci/drm/savage_bci.c
index a96e623f59a..14aad7b0342 100644
--- a/sys/dev/pci/drm/savage_bci.c
+++ b/sys/dev/pci/drm/savage_bci.c
@@ -726,7 +726,6 @@ static int savage_do_init_bci(struct drm_device *dev, drm_savage_init_t *init)
 		dev_priv->status = NULL;
 	}
 	if (dev_priv->dma_type == SAVAGE_DMA_AGP && init->buffers_offset) {
-		dev->agp_buffer_token = init->buffers_offset;
 		dev->agp_buffer_map = drm_core_findmap(dev,
 						       init->buffers_offset);
 		if (!dev->agp_buffer_map) {