drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h>

And replace the drm_core_ prefix with drm_legacy_ since really, this
isn't core stuff.

Also drop drm_core_dropmap since it's unused.

v2: Fix up i810.ko fully which somehow slipped through.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

11 files changed, 88 insertions, 91 deletions

diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c
index 62fda6aaad90..a521ef6ff807 100644
--- a/drivers/gpu/drm/drm_memory.c
+++ b/drivers/gpu/drm/drm_memory.c
@@ -120,25 +120,25 @@ static inline void *agp_remap(unsigned long offset, unsigned long size,
 
 #endif                          /* agp */
 
-void drm_core_ioremap(struct drm_local_map *map, struct drm_device *dev)
+void drm_legacy_ioremap(struct drm_local_map *map, struct drm_device *dev)
 {
         if (dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
                 map->handle = agp_remap(map->offset, map->size, dev);
         else
                 map->handle = ioremap(map->offset, map->size);
 }
-EXPORT_SYMBOL(drm_core_ioremap);
+EXPORT_SYMBOL(drm_legacy_ioremap);
 
-void drm_core_ioremap_wc(struct drm_local_map *map, struct drm_device *dev)
+void drm_legacy_ioremap_wc(struct drm_local_map *map, struct drm_device *dev)
 {
         if (dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
                 map->handle = agp_remap(map->offset, map->size, dev);
         else
                 map->handle = ioremap_wc(map->offset, map->size);
 }
-EXPORT_SYMBOL(drm_core_ioremap_wc);
+EXPORT_SYMBOL(drm_legacy_ioremap_wc);
 
-void drm_core_ioremapfree(struct drm_local_map *map, struct drm_device *dev)
+void drm_legacy_ioremapfree(struct drm_local_map *map, struct drm_device *dev)
 {
         if (!map->handle || !map->size)
                 return;
@@ -148,4 +148,4 @@ void drm_core_ioremapfree(struct drm_local_map *map, struct drm_device *dev)
         else
                 iounmap(map->handle);
 }
-EXPORT_SYMBOL(drm_core_ioremapfree);
+EXPORT_SYMBOL(drm_legacy_ioremapfree);
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index c97e2ff6a35a..d91856779beb 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -213,7 +213,7 @@ static int i810_dma_cleanup(struct drm_device *dev)
                     (drm_i810_private_t *) dev->dev_private;
 
                 if (dev_priv->ring.virtual_start)
-                        drm_core_ioremapfree(&dev_priv->ring.map, dev);
+                        drm_legacy_ioremapfree(&dev_priv->ring.map, dev);
                 if (dev_priv->hw_status_page) {
                         pci_free_consistent(dev->pdev, PAGE_SIZE,
                                             dev_priv->hw_status_page,
@@ -227,7 +227,7 @@ static int i810_dma_cleanup(struct drm_device *dev)
                         drm_i810_buf_priv_t *buf_priv = buf->dev_private;
 
                         if (buf_priv->kernel_virtual && buf->total)
-                                drm_core_ioremapfree(&buf_priv->map, dev);
+                                drm_legacy_ioremapfree(&buf_priv->map, dev);
                 }
         }
         return 0;
@@ -306,7 +306,7 @@ static int i810_freelist_init(struct drm_device *dev, drm_i810_private_t *dev_pr
                 buf_priv->map.flags = 0;
                 buf_priv->map.mtrr = 0;
 
-                drm_core_ioremap(&buf_priv->map, dev);
+                drm_legacy_ioremap(&buf_priv->map, dev);
                 buf_priv->kernel_virtual = buf_priv->map.handle;
 
         }
@@ -334,7 +334,7 @@ static int i810_dma_initialize(struct drm_device *dev,
                 DRM_ERROR("can not find sarea!\n");
                 return -EINVAL;
         }
-        dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset);
+        dev_priv->mmio_map = drm_legacy_findmap(dev, init->mmio_offset);
         if (!dev_priv->mmio_map) {
                 dev->dev_private = (void *)dev_priv;
                 i810_dma_cleanup(dev);
@@ -342,7 +342,7 @@ static int i810_dma_initialize(struct drm_device *dev,
                 return -EINVAL;
         }
         dev->agp_buffer_token = init->buffers_offset;
-        dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
+        dev->agp_buffer_map = drm_legacy_findmap(dev, init->buffers_offset);
         if (!dev->agp_buffer_map) {
                 dev->dev_private = (void *)dev_priv;
                 i810_dma_cleanup(dev);
@@ -363,7 +363,7 @@ static int i810_dma_initialize(struct drm_device *dev,
         dev_priv->ring.map.flags = 0;
         dev_priv->ring.map.mtrr = 0;
 
-        drm_core_ioremap(&dev_priv->ring.map, dev);
+        drm_legacy_ioremap(&dev_priv->ring.map, dev);
 
         if (dev_priv->ring.map.handle == NULL) {
                 dev->dev_private = (void *)dev_priv;
diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c
index 37d80c122483..8cfa9cb74c86 100644
--- a/drivers/gpu/drm/mga/mga_dma.c
+++ b/drivers/gpu/drm/mga/mga_dma.c
@@ -566,9 +566,9 @@ static int mga_do_agp_dma_bootstrap(struct drm_device *dev,
                 return err;
         }
 
-        drm_core_ioremap(dev_priv->warp, dev);
-        drm_core_ioremap(dev_priv->primary, dev);
-        drm_core_ioremap(dev->agp_buffer_map, dev);
+        drm_legacy_ioremap(dev_priv->warp, dev);
+        drm_legacy_ioremap(dev_priv->primary, dev);
+        drm_legacy_ioremap(dev->agp_buffer_map, dev);
 
         if (!dev_priv->warp->handle ||
             !dev_priv->primary->handle || !dev->agp_buffer_map->handle) {
@@ -821,37 +821,37 @@ static int mga_do_init_dma(struct drm_device *dev, drm_mga_init_t *init)
                 dev_priv->dma_access = MGA_PAGPXFER;
                 dev_priv->wagp_enable = MGA_WAGP_ENABLE;
 
-                dev_priv->status = drm_core_findmap(dev, init->status_offset);
+                dev_priv->status = drm_legacy_findmap(dev, init->status_offset);
                 if (!dev_priv->status) {
                         DRM_ERROR("failed to find status page!\n");
                         return -EINVAL;
                 }
-                dev_priv->mmio = drm_core_findmap(dev, init->mmio_offset);
+                dev_priv->mmio = drm_legacy_findmap(dev, init->mmio_offset);
                 if (!dev_priv->mmio) {
                         DRM_ERROR("failed to find mmio region!\n");
                         return -EINVAL;
                 }
-                dev_priv->warp = drm_core_findmap(dev, init->warp_offset);
+                dev_priv->warp = drm_legacy_findmap(dev, init->warp_offset);
                 if (!dev_priv->warp) {
                         DRM_ERROR("failed to find warp microcode region!\n");
                         return -EINVAL;
                 }
-                dev_priv->primary = drm_core_findmap(dev, init->primary_offset);
+                dev_priv->primary = drm_legacy_findmap(dev, init->primary_offset);