drm: Remove memory debugging infrastructure.

It hasn't been used in ages, and having the user tell your how much
memory is being freed at free time is a recipe for disaster even if it
was ever used.

Signed-off-by: Eric Anholt <eric@anholt.net>

2 files changed, 46 insertions, 50 deletions

diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
index 077c0455a6b9..c75fd3564040 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
@@ -353,12 +353,10 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
 
         DRM_DEBUG("\n");
 
-        dev_priv = drm_alloc(sizeof(drm_r128_private_t), DRM_MEM_DRIVER);
+        dev_priv = kzalloc(sizeof(drm_r128_private_t), GFP_KERNEL);
         if (dev_priv == NULL)
                 return -ENOMEM;
 
-        memset(dev_priv, 0, sizeof(drm_r128_private_t));
-
         dev_priv->is_pci = init->is_pci;
 
         if (dev_priv->is_pci && !dev->sg) {
@@ -619,8 +617,7 @@ int r128_do_cleanup_cce(struct drm_device * dev)
                                             ("failed to cleanup PCI GART!\n");
                 }
 
-                drm_free(dev->dev_private, sizeof(drm_r128_private_t),
-                         DRM_MEM_DRIVER);
+                kfree(dev->dev_private);
                 dev->dev_private = NULL;
         }
 
@@ -768,18 +765,17 @@ static int r128_freelist_init(struct drm_device * dev)
         drm_r128_freelist_t *entry;
         int i;
 
-        dev_priv->head = drm_alloc(sizeof(drm_r128_freelist_t), DRM_MEM_DRIVER);
+        dev_priv->head = kzalloc(sizeof(drm_r128_freelist_t), GFP_KERNEL);
         if (dev_priv->head == NULL)
                 return -ENOMEM;
 
-        memset(dev_priv->head, 0, sizeof(drm_r128_freelist_t));
         dev_priv->head->age = R128_BUFFER_USED;
 
         for (i = 0; i < dma->buf_count; i++) {
                 buf = dma->buflist[i];
                 buf_priv = buf->dev_private;
 
-                entry = drm_alloc(sizeof(drm_r128_freelist_t), DRM_MEM_DRIVER);
+                entry = kmalloc(sizeof(drm_r128_freelist_t), GFP_KERNEL);
                 if (!entry)
                         return -ENOMEM;
 
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
index f7a5b5740764..026a48c95c8f 100644
--- a/drivers/gpu/drm/r128/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c
@@ -910,24 +910,24 @@ static int r128_cce_dispatch_write_span(struct drm_device * dev,
         }
 
         buffer_size = depth->n * sizeof(u32);
-        buffer = drm_alloc(buffer_size, DRM_MEM_BUFS);
+        buffer = kmalloc(buffer_size, GFP_KERNEL);
         if (buffer == NULL)
                 return -ENOMEM;
         if (DRM_COPY_FROM_USER(buffer, depth->buffer, buffer_size)) {
-                drm_free(buffer, buffer_size, DRM_MEM_BUFS);
+                kfree(buffer);
                 return -EFAULT;
         }
 
         mask_size = depth->n * sizeof(u8);
         if (depth->mask) {
-                mask = drm_alloc(mask_size, DRM_MEM_BUFS);
+                mask = kmalloc(mask_size, GFP_KERNEL);
                 if (mask == NULL) {
-                        drm_free(buffer, buffer_size, DRM_MEM_BUFS);
+                        kfree(buffer);
                         return -ENOMEM;
                 }
                 if (DRM_COPY_FROM_USER(mask, depth->mask, mask_size)) {
-                        drm_free(buffer, buffer_size, DRM_MEM_BUFS);
-                        drm_free(mask, mask_size, DRM_MEM_BUFS);
+                        kfree(buffer);
+                        kfree(mask);
                         return -EFAULT;
                 }
 
@@ -954,7 +954,7 @@ static int r128_cce_dispatch_write_span(struct drm_device * dev,
                         }
                 }
 
-                drm_free(mask, mask_size, DRM_MEM_BUFS);
+                kfree(mask);
         } else {
                 for (i = 0; i < count; i++, x++) {
                         BEGIN_RING(6);
@@ -978,7 +978,7 @@ static int r128_cce_dispatch_write_span(struct drm_device * dev,
                 }
         }
 
-        drm_free(buffer, buffer_size, DRM_MEM_BUFS);
+        kfree(buffer);
 
         return 0;
 }
@@ -1000,54 +1000,54 @@ static int r128_cce_dispatch_write_pixels(struct drm_device * dev,
 
         xbuf_size = count * sizeof(*x);
         ybuf_size = count * sizeof(*y);
-        x = drm_alloc(xbuf_size, DRM_MEM_BUFS);
+        x = kmalloc(xbuf_size, GFP_KERNEL);
         if (x == NULL) {
                 return -ENOMEM;
         }
-        y = drm_alloc(ybuf_size, DRM_MEM_BUFS);
+        y = kmalloc(ybuf_size, GFP_KERNEL);
         if (y == NULL) {
-                drm_free(x, xbuf_size, DRM_MEM_BUFS);
+                kfree(x);
                 return -ENOMEM;
         }
         if (DRM_COPY_FROM_USER(x, depth->x, xbuf_size)) {
-                drm_free(x, xbuf_size, DRM_MEM_BUFS);
-                drm_free(y, ybuf_size, DRM_MEM_BUFS);
+                kfree(x);
+                kfree(y);
                 return -EFAULT;
         }
         if (DRM_COPY_FROM_USER(y, depth->y, xbuf_size)) {
-                drm_free(x, xbuf_size, DRM_MEM_BUFS);
-                drm_free(y, ybuf_size, DRM_MEM_BUFS);
+                kfree(x);
+                kfree(y);
                 return -EFAULT;
         }
 
         buffer_size = depth->n * sizeof(u32);
-        buffer = drm_alloc(buffer_size, DRM_MEM_BUFS);
+        buffer = kmalloc(buffer_size, GFP_KERNEL);
         if (buffer == NULL) {
-                drm_free(x, xbuf_size, DRM_MEM_BUFS);
-                drm_free(y, ybuf_size, DRM_MEM_BUFS);
+                kfree(x);
+                kfree(y);
                 return -ENOMEM;
         }
         if (DRM_COPY_FROM_USER(buffer, depth->buffer, buffer_size)) {
-                drm_free(x, xbuf_size, DRM_MEM_BUFS);
-                drm_free(y, ybuf_size, DRM_MEM_BUFS);
-                drm_free(buffer, buffer_size, DRM_MEM_BUFS);
+                kfree(x);
+                kfree(y);
+                kfree(buffer);
                 return -EFAULT;
         }
 
         if (depth->mask) {
                 mask_size = depth->n * sizeof(u8);
-                mask = drm_alloc(mask_size, DRM_MEM_BUFS);
+                mask = kmalloc(mask_size, GFP_KERNEL);
                 if (mask == NULL) {
-                        drm_free(x, xbuf_size, DRM_MEM_BUFS);
-                        drm_free(y, ybuf_size, DRM_MEM_BUFS);
-                        drm_free(buffer, buffer_size, DRM_MEM_BUFS);
+                        kfree(x);
+                        kfree(y);
+                        kfree(buffer);
                         return -ENOMEM;
                 }
                 if (DRM_COPY_FROM_USER(mask, depth->mask, mask_size)) {
-                        drm_free(x, xbuf_size, DRM_MEM_BUFS);
-                        drm_free(y, ybuf_size, DRM_MEM_BUFS);
-                        drm_free(buffer, buffer_size, DRM_MEM_BUFS);
-                        drm_free(mask, mask_size, DRM_MEM_BUFS);
+                        kfree(x);
+                        kfree(y);
+                        kfree(buffer);
+                        kfree(mask);
                         return -EFAULT;
                 }
 
@@ -1074,7 +1074,7 @@ static int r128_cce_dispatch_write_pixels(struct drm_device * dev,
                         }
                 }
 
-                drm_free(mask, mask_size, DRM_MEM_BUFS);
+                kfree(mask);
         } else {
                 for (i = 0; i < count; i++) {
                         BEGIN_RING(6);
@@ -1098,9 +1098,9 @@ static int r128_cce_dispatch_write_pixels(struct drm_device * dev,
                 }
         }
 
-        drm_free(x, xbuf_size, DRM_MEM_BUFS);
-        drm_free(y, ybuf_size, DRM_MEM_BUFS);
-        drm_free(buffer, buffer_size, DRM_MEM_BUFS);
+        kfree(x);
+        kfree(y);
+        kfree(buffer);
 
         return 0;
 }
@@ -1167,23 +1167,23 @@ static int r128_cce_dispatch_read_pixels(struct drm_device * dev,
 
         xbuf_size = count * sizeof(*x);
         ybuf_size = count * sizeof(*y);
-        x = drm_alloc(xbuf_size, DRM_MEM_BUFS);
+        x = kmalloc(xbuf_size, GFP_KERNEL);
         if (x == NULL) {
                 return -ENOMEM;
         }
-        y = drm_alloc(ybuf_size, DRM_MEM_BUFS);
+        y = kmalloc(ybuf_size, GFP_KERNEL);
         if (y == NULL) {
-                drm_free(x, xbuf_size, DRM_MEM_BUFS);
+                kfree(x);
                 return -ENOMEM;
         }
         if (DRM_COPY_FROM_USER(x, depth->x, xbuf_size)) {
-                drm_free(x, xbuf_size, DRM_MEM_BUFS);
-                drm_free(y, ybuf_size, DRM_MEM_BUFS);
+                kfree(x);
+                kfree(y);
                 return -EFAULT;
         }
         if (DRM_COPY_FROM_USER(y, depth->y, ybuf_size)) {
-                drm_free(x, xbuf_size, DRM_MEM_BUFS);
-                drm_free(y, ybuf_size, DRM_MEM_BUFS);
+                kfree(x);
+                kfree(y);
                 return -EFAULT;
         }
 
@@ -1210,8 +1210,8 @@ static int r128_cce_dispatch_read_pixels(struct drm_device * dev,
                 ADVANCE_RING();
         }
 
-        drm_free(x, xbuf_size, DRM_MEM_BUFS);
-        drm_free(y, ybuf_size, DRM_MEM_BUFS);
+        kfree(x);
+        kfree(y);
 
         return 0;
 }