drm: Remove standalone mtrr code

Not needed anymore and causes linker warnings on linux 4.3.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>

3 files changed, 0 insertions, 35 deletions

diff --git a/drm_bufs.c b/drm_bufs.c
index 949f172..96c1858 100644
--- a/drm_bufs.c
+++ b/drm_bufs.c
@@ -216,13 +216,6 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
 			return 0;
 		}
 
-		if (drm_core_has_MTRR(dev)) {
-			if (map->type == _DRM_FRAME_BUFFER ||
-			    (map->flags & _DRM_WRITE_COMBINING)) {
-				map->mtrr = mtrr_add(map->offset, map->size,
-						     MTRR_TYPE_WRCOMB, 1);
-			}
-		}
 		if (map->type == _DRM_REGISTERS) {
 			map->handle = ioremap(map->offset, map->size);
 			if (!map->handle) {
@@ -436,11 +429,6 @@ int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map)
 		iounmap(map->handle);
 		/* FALLTHROUGH */
 	case _DRM_FRAME_BUFFER:
-		if (drm_core_has_MTRR(dev) && map->mtrr >= 0) {
-			int retcode;
-			retcode = mtrr_del(map->mtrr, map->offset, map->size);
-			DRM_DEBUG("mtrr_del=%d\n", retcode);
-		}
 		break;
 	case _DRM_SHM:
 		vfree(map->handle);
diff --git a/drm_stub.c b/drm_stub.c
index 9a0b892..05ac80c 100644
--- a/drm_stub.c
+++ b/drm_stub.c
@@ -329,13 +329,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
 			retcode = -EINVAL;
 			goto error_out_unreg;
 		}
-		if (drm_core_has_MTRR(dev)) {
-			if (dev->agp)
-				dev->agp->agp_mtrr =
-				    mtrr_add(dev->agp->agp_info.aper_base,
-					     dev->agp->agp_info.aper_size *
-					     1024 * 1024, MTRR_TYPE_WRCOMB, 1);
-		}
 	}
 
 
@@ -578,15 +571,6 @@ void drm_put_dev(struct drm_device *dev)
 
 	drm_lastclose(dev);
 
-	if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) &&
-	    dev->agp && dev->agp->agp_mtrr >= 0) {
-		int retval;
-		retval = mtrr_del(dev->agp->agp_mtrr,
-				  dev->agp->agp_info.aper_base,
-				  dev->agp->agp_info.aper_size * 1024 * 1024);
-		DRM_DEBUG("mtrr_del=%d\n", retval);
-	}
-
 	if (dev->driver->unload)
 		dev->driver->unload(dev);
 
diff --git a/drm_vm.c b/drm_vm.c
index 36f27d6..b667510 100644
--- a/drm_vm.c
+++ b/drm_vm.c
@@ -236,13 +236,6 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
 			switch (map->type) {
 			case _DRM_REGISTERS:
 			case _DRM_FRAME_BUFFER:
-				if (drm_core_has_MTRR(dev) && map->mtrr >= 0) {
-					int retcode;
-					retcode = mtrr_del(map->mtrr,
-							   map->offset,
-							   map->size);
-					DRM_DEBUG("mtrr_del = %d\n", retcode);
-				}
 				iounmap(map->handle);
 				break;
 			case _DRM_SHM: