Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (24 commits)
  agp/intel: Make intel_i965_mask_memory use dma_addr_t for physical addresses
  agp: add user mapping support to ATI AGP bridge.
  drm/i915: enable GEM on PAE.
  drm/radeon: fix unused variables warning
  agp: switch AGP to use page array instead of unsigned long array
  agpgart: detected ALi M???? chipset with M1621
  drm/radeon: command stream checker for r3xx-r5xx hardware
  drm/radeon: Fully initialize LVDS info also when we can't get it from the ROM.
  radeon: Fix CP byte order on big endian architectures with KMS.
  agp/uninorth: Handle user memory types.
  drm/ttm: Add some powerpc cache flush code.
  radeon: Enable modesetting on non-x86.
  drm/radeon: Respect AGP cant_use_aperture flag.
  drm: EDID endianness fixes.
  drm/radeon: this VRAM vs aperture test is wrong, just remove it.
  drm/ttm: fix an error path to exit function correctly
  drm: Apply "Memory fragmentation from lost alignment blocks"
  ttm: Return -ERESTART when a signal interrupts bo eviction.
  drm: Remove memory debugging infrastructure.
  drm/i915: Clear fence register on tiling stride change.
  ...

1 files changed, 7 insertions, 24 deletions

diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c
index 7a8e2fba4678..13f1537413fb 100644
--- 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;
 }