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, 9 insertions, 10 deletions

diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 387a8de1bc7..155a5bbce68 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -107,7 +107,7 @@ struct drm_master *drm_master_create(struct drm_minor *minor)
 {
         struct drm_master *master;
 
-        master = drm_calloc(1, sizeof(*master), DRM_MEM_DRIVER);
+        master = kzalloc(sizeof(*master), GFP_KERNEL);
         if (!master)
                 return NULL;
 
@@ -149,7 +149,7 @@ static void drm_master_destroy(struct kref *kref)
         }
 
         if (master->unique) {
-                drm_free(master->unique, master->unique_size, DRM_MEM_DRIVER);
+                kfree(master->unique);
                 master->unique = NULL;
                 master->unique_len = 0;
         }
@@ -157,12 +157,12 @@ static void drm_master_destroy(struct kref *kref)
         list_for_each_entry_safe(pt, next, &master->magicfree, head) {
                 list_del(&pt->head);
                 drm_ht_remove_item(&master->magiclist, &pt->hash_item);
-                drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
+                kfree(pt);
         }
 
         drm_ht_remove(&master->magiclist);
 
-        drm_free(master, sizeof(*master), DRM_MEM_DRIVER);
+        kfree(master);
 }
 
 void drm_master_put(struct drm_master **master)
@@ -390,7 +390,7 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
 
         DRM_DEBUG("\n");
 
-        dev = drm_calloc(1, sizeof(*dev), DRM_MEM_STUB);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (!dev)
                 return -ENOMEM;
 
@@ -443,7 +443,7 @@ err_g3:
 err_g2:
         pci_disable_device(pdev);
 err_g1:
-        drm_free(dev, sizeof(*dev), DRM_MEM_STUB);
+        kfree(dev);
         return ret;
 }
 EXPORT_SYMBOL(drm_get_dev);
@@ -516,7 +516,7 @@ void drm_put_dev(struct drm_device *dev)
                 dev->driver->unload(dev);
 
         if (drm_core_has_AGP(dev) && dev->agp) {
-                drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
+                kfree(dev->agp);
                 dev->agp = NULL;
         }
 
@@ -535,10 +535,9 @@ void drm_put_dev(struct drm_device *dev)
         drm_put_minor(&dev->primary);
 
         if (dev->devname) {
-                drm_free(dev->devname, strlen(dev->devname) + 1,
-                         DRM_MEM_DRIVER);
+                kfree(dev->devname);
                 dev->devname = NULL;
         }
-        drm_free(dev, sizeof(*dev), DRM_MEM_STUB);
+        kfree(dev);
 }
 EXPORT_SYMBOL(drm_put_dev);