drm: Remove memory debugging infrastructure.

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

diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c
index 7a8e2fba46781f70ebaac9e1ad3f0c9c2d2bc4da..13f1537413fbea7b05418da6408daaa6198087a8 100644 (file)
--- a/drivers/gpu/drm/drm_dma.c
+++ b/drivers/gpu/drm/drm_dma.c
@@ -47,7 +47,7 @@ int drm_dma_setup(struct drm_device *dev)
 {
        int i;
 
-       dev->dma = drm_alloc(sizeof(*dev->dma), DRM_MEM_DRIVER);
+       dev->dma = kmalloc(sizeof(*dev->dma), GFP_KERNEL);
        if (!dev->dma)
                return -ENOMEM;
 
@@ -88,36 +88,19 @@ void drm_dma_takedown(struct drm_device *dev)
                                        drm_pci_free(dev, dma->bufs[i].seglist[j]);
                                }
                        }
-                       drm_free(dma->bufs[i].seglist,
-                                dma->bufs[i].seg_count
-                                * sizeof(*dma->bufs[0].seglist), DRM_MEM_SEGS);
+                       kfree(dma->bufs[i].seglist);
                }
                if (dma->bufs[i].buf_count) {
                        for (j = 0; j < dma->bufs[i].buf_count; j++) {
-                               if (dma->bufs[i].buflist[j].dev_private) {
-                                       drm_free(dma->bufs[i].buflist[j].
-                                                dev_private,
-                                                dma->bufs[i].buflist[j].
-                                                dev_priv_size, DRM_MEM_BUFS);
-                               }
+                               kfree(dma->bufs[i].buflist[j].dev_private);
                        }
-                       drm_free(dma->bufs[i].buflist,
-                                dma->bufs[i].buf_count *
-                                sizeof(*dma->bufs[0].buflist), DRM_MEM_BUFS);
+                       kfree(dma->bufs[i].buflist);
                }
        }
 
-       if (dma->buflist) {
-               drm_free(dma->buflist,
-                        dma->buf_count * sizeof(*dma->buflist), DRM_MEM_BUFS);
-       }
-
-       if (dma->pagelist) {
-               drm_free(dma->pagelist,
-                        dma->page_count * sizeof(*dma->pagelist),
-                        DRM_MEM_PAGES);
-       }
-       drm_free(dev->dma, sizeof(*dev->dma), DRM_MEM_DRIVER);
+       kfree(dma->buflist);
+       kfree(dma->pagelist);
+       kfree(dev->dma);
        dev->dma = NULL;
 }