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>
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user