drm: Remove memory debugging infrastructure.

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / gpu / drm / savage / savage_bci.c

diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
index 456cd040f31a285e732d0d1752bc5cc8e8a506bb..bff6fc2524c89e0f564e9621e377834ac8d02bda 100644 (file)
--- a/drivers/gpu/drm/savage/savage_bci.c
+++ b/drivers/gpu/drm/savage/savage_bci.c
@@ -298,8 +298,8 @@ static int savage_dma_init(drm_savage_private_t * dev_priv)
 
        dev_priv->nr_dma_pages = dev_priv->cmd_dma->size /
            (SAVAGE_DMA_PAGE_SIZE * 4);
-       dev_priv->dma_pages = drm_alloc(sizeof(drm_savage_dma_page_t) *
-                                       dev_priv->nr_dma_pages, DRM_MEM_DRIVER);
+       dev_priv->dma_pages = kmalloc(sizeof(drm_savage_dma_page_t) *
+                                     dev_priv->nr_dma_pages, GFP_KERNEL);
        if (dev_priv->dma_pages == NULL)
                return -ENOMEM;
 
@@ -539,7 +539,7 @@ int savage_driver_load(struct drm_device *dev, unsigned long chipset)
 {
        drm_savage_private_t *dev_priv;
 
-       dev_priv = drm_alloc(sizeof(drm_savage_private_t), DRM_MEM_DRIVER);
+       dev_priv = kmalloc(sizeof(drm_savage_private_t), GFP_KERNEL);
        if (dev_priv == NULL)
                return -ENOMEM;
 
@@ -671,7 +671,7 @@ int savage_driver_unload(struct drm_device *dev)
 {
        drm_savage_private_t *dev_priv = dev->dev_private;
 
-       drm_free(dev_priv, sizeof(drm_savage_private_t), DRM_MEM_DRIVER);
+       kfree(dev_priv);
 
        return 0;
 }
@@ -804,8 +804,8 @@ static int savage_do_init_bci(struct drm_device * dev, drm_savage_init_t * init)
                dev_priv->fake_dma.offset = 0;
                dev_priv->fake_dma.size = SAVAGE_FAKE_DMA_SIZE;
                dev_priv->fake_dma.type = _DRM_SHM;
-               dev_priv->fake_dma.handle = drm_alloc(SAVAGE_FAKE_DMA_SIZE,
-                                                     DRM_MEM_DRIVER);
+               dev_priv->fake_dma.handle = kmalloc(SAVAGE_FAKE_DMA_SIZE,
+                                                   GFP_KERNEL);
                if (!dev_priv->fake_dma.handle) {
                        DRM_ERROR("could not allocate faked DMA buffer!\n");
                        savage_do_cleanup_bci(dev);
@@ -903,9 +903,7 @@ static int savage_do_cleanup_bci(struct drm_device * dev)
        drm_savage_private_t *dev_priv = dev->dev_private;
 
        if (dev_priv->cmd_dma == &dev_priv->fake_dma) {
-               if (dev_priv->fake_dma.handle)
-                       drm_free(dev_priv->fake_dma.handle,
-                                SAVAGE_FAKE_DMA_SIZE, DRM_MEM_DRIVER);
+               kfree(dev_priv->fake_dma.handle);
        } else if (dev_priv->cmd_dma && dev_priv->cmd_dma->handle &&
                   dev_priv->cmd_dma->type == _DRM_AGP &&
                   dev_priv->dma_type == SAVAGE_DMA_AGP)
@@ -920,10 +918,7 @@ static int savage_do_cleanup_bci(struct drm_device * dev)
                dev->agp_buffer_map = NULL;
        }
 
-       if (dev_priv->dma_pages)
-               drm_free(dev_priv->dma_pages,
-                        sizeof(drm_savage_dma_page_t) * dev_priv->nr_dma_pages,
-                        DRM_MEM_DRIVER);
+       kfree(dev_priv->dma_pages);
 
        return 0;
 }