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, 16 insertions, 28 deletions

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index fc8e5acd9d9..b4a3dbcebe9 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -104,21 +104,13 @@ void drm_vblank_cleanup(struct drm_device *dev)
 
         vblank_disable_fn((unsigned long)dev);
 
-        drm_free(dev->vbl_queue, sizeof(*dev->vbl_queue) * dev->num_crtcs,
-                 DRM_MEM_DRIVER);
-        drm_free(dev->_vblank_count, sizeof(*dev->_vblank_count) *
-                 dev->num_crtcs, DRM_MEM_DRIVER);
-        drm_free(dev->vblank_refcount, sizeof(*dev->vblank_refcount) *
-                 dev->num_crtcs, DRM_MEM_DRIVER);
-        drm_free(dev->vblank_enabled, sizeof(*dev->vblank_enabled) *
-                 dev->num_crtcs, DRM_MEM_DRIVER);
-        drm_free(dev->last_vblank, sizeof(*dev->last_vblank) * dev->num_crtcs,
-                 DRM_MEM_DRIVER);
-        drm_free(dev->last_vblank_wait,
-                 sizeof(*dev->last_vblank_wait) * dev->num_crtcs,
-                 DRM_MEM_DRIVER);
-        drm_free(dev->vblank_inmodeset, sizeof(*dev->vblank_inmodeset) *
-                 dev->num_crtcs, DRM_MEM_DRIVER);
+        kfree(dev->vbl_queue);
+        kfree(dev->_vblank_count);
+        kfree(dev->vblank_refcount);
+        kfree(dev->vblank_enabled);
+        kfree(dev->last_vblank);
+        kfree(dev->last_vblank_wait);
+        kfree(dev->vblank_inmodeset);
 
         dev->num_crtcs = 0;
 }
@@ -132,37 +124,33 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs)
         spin_lock_init(&dev->vbl_lock);
         dev->num_crtcs = num_crtcs;
 
-        dev->vbl_queue = drm_alloc(sizeof(wait_queue_head_t) * num_crtcs,
-                                   DRM_MEM_DRIVER);
+        dev->vbl_queue = kmalloc(sizeof(wait_queue_head_t) * num_crtcs,
+                                 GFP_KERNEL);
         if (!dev->vbl_queue)
                 goto err;
 
-        dev->_vblank_count = drm_alloc(sizeof(atomic_t) * num_crtcs,
-                                      DRM_MEM_DRIVER);
+        dev->_vblank_count = kmalloc(sizeof(atomic_t) * num_crtcs, GFP_KERNEL);
         if (!dev->_vblank_count)
                 goto err;
 
-        dev->vblank_refcount = drm_alloc(sizeof(atomic_t) * num_crtcs,
-                                         DRM_MEM_DRIVER);
+        dev->vblank_refcount = kmalloc(sizeof(atomic_t) * num_crtcs,
+                                       GFP_KERNEL);
         if (!dev->vblank_refcount)
                 goto err;
 
-        dev->vblank_enabled = drm_calloc(num_crtcs, sizeof(int),
-                                         DRM_MEM_DRIVER);
+        dev->vblank_enabled = kcalloc(num_crtcs, sizeof(int), GFP_KERNEL);
         if (!dev->vblank_enabled)
                 goto err;
 
-        dev->last_vblank = drm_calloc(num_crtcs, sizeof(u32), DRM_MEM_DRIVER);
+        dev->last_vblank = kcalloc(num_crtcs, sizeof(u32), GFP_KERNEL);
         if (!dev->last_vblank)
                 goto err;
 
-        dev->last_vblank_wait = drm_calloc(num_crtcs, sizeof(u32),
-                                           DRM_MEM_DRIVER);
+        dev->last_vblank_wait = kcalloc(num_crtcs, sizeof(u32), GFP_KERNEL);
         if (!dev->last_vblank_wait)
                 goto err;
 
-        dev->vblank_inmodeset = drm_calloc(num_crtcs, sizeof(int),
-                                         DRM_MEM_DRIVER);
+        dev->vblank_inmodeset = kcalloc(num_crtcs, sizeof(int), GFP_KERNEL);
         if (!dev->vblank_inmodeset)
                 goto err;