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, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index ec43005100d9..8104ecaea26f 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -89,7 +89,7 @@ drm_gem_init(struct drm_device *dev)
         atomic_set(&dev->gtt_count, 0);
         atomic_set(&dev->gtt_memory, 0);
 
-        mm = drm_calloc(1, sizeof(struct drm_gem_mm), DRM_MEM_MM);
+        mm = kzalloc(sizeof(struct drm_gem_mm), GFP_KERNEL);
         if (!mm) {
                 DRM_ERROR("out of memory\n");
                 return -ENOMEM;
@@ -98,14 +98,14 @@ drm_gem_init(struct drm_device *dev)
         dev->mm_private = mm;
 
         if (drm_ht_create(&mm->offset_hash, 19)) {
-                drm_free(mm, sizeof(struct drm_gem_mm), DRM_MEM_MM);
+                kfree(mm);
                 return -ENOMEM;
         }
 
         if (drm_mm_init(&mm->offset_manager, DRM_FILE_PAGE_OFFSET_START,
                         DRM_FILE_PAGE_OFFSET_SIZE)) {
                 drm_ht_remove(&mm->offset_hash);
-                drm_free(mm, sizeof(struct drm_gem_mm), DRM_MEM_MM);
+                kfree(mm);
                 return -ENOMEM;
         }
 
@@ -119,7 +119,7 @@ drm_gem_destroy(struct drm_device *dev)
 
         drm_mm_takedown(&mm->offset_manager);
         drm_ht_remove(&mm->offset_hash);
-        drm_free(mm, sizeof(struct drm_gem_mm), DRM_MEM_MM);
+        kfree(mm);
         dev->mm_private = NULL;
 }