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

diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index 14796594e5d9..d68888fe3df9 100644
--- a/drivers/gpu/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c
@@ -203,7 +203,7 @@ int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
 
         if (!dev->agp || !dev->agp->acquired)
                 return -EINVAL;
-        if (!(entry = drm_alloc(sizeof(*entry), DRM_MEM_AGPLISTS)))
+        if (!(entry = kmalloc(sizeof(*entry), GFP_KERNEL)))
                 return -ENOMEM;
 
         memset(entry, 0, sizeof(*entry));
@@ -211,7 +211,7 @@ int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
         pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE;
         type = (u32) request->type;
         if (!(memory = drm_alloc_agp(dev, pages, type))) {
-                drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
+                kfree(entry);
                 return -ENOMEM;
         }
 
@@ -369,7 +369,7 @@ int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request)
         list_del(&entry->head);
 
         drm_free_agp(entry->memory, entry->pages);
-        drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
+        kfree(entry);
         return 0;
 }
 EXPORT_SYMBOL(drm_agp_free);
@@ -397,13 +397,13 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev)
 {
         struct drm_agp_head *head = NULL;
 
-        if (!(head = drm_alloc(sizeof(*head), DRM_MEM_AGPLISTS)))
+        if (!(head = kmalloc(sizeof(*head), GFP_KERNEL)))
                 return NULL;
         memset((void *)head, 0, sizeof(*head));
         head->bridge = agp_find_bridge(dev->pdev);
         if (!head->bridge) {
                 if (!(head->bridge = agp_backend_acquire(dev->pdev))) {
-                        drm_free(head, sizeof(*head), DRM_MEM_AGPLISTS);
+                        kfree(head);
                         return NULL;
                 }
                 agp_copy_info(head->bridge, &head->agp_info);
@@ -412,7 +412,7 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev)
                 agp_copy_info(head->bridge, &head->agp_info);
         }
         if (head->agp_info.chipset == NOT_SUPPORTED) {
-                drm_free(head, sizeof(*head), DRM_MEM_AGPLISTS);
+                kfree(head);
                 return NULL;
         }
         INIT_LIST_HEAD(&head->memory);
@@ -482,7 +482,7 @@ drm_agp_bind_pages(struct drm_device *dev,
         }
 
         for (i = 0; i < num_pages; i++)
-                mem->memory[i] = phys_to_gart(page_to_phys(pages[i]));
+                mem->pages[i] = pages[i];
         mem->page_count = num_pages;
 
         mem->is_flushed = true;