drm: more cleanups
[platform/upstream/libdrm.git] / linux-core / drm_agpsupport.c
index 77994d5..b5dcbb3 100644 (file)
@@ -40,7 +40,7 @@
  * Get AGP information.
  *
  * \param inode device inode.
- * \param filp file pointer.
+ * \param file_priv DRM file private.
  * \param cmd command.
  * \param arg pointer to a (output) drm_agp_info structure.
  * \return zero on success or a negative number on failure.
@@ -48,7 +48,7 @@
  * Verifies the AGP device has been initialized and acquired and fills in the
  * drm_agp_info structure with the information in drm_agp_head::agp_info.
  */
-int drm_agp_info(drm_device_t * dev, drm_agp_info_t *info)
+int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info)
 {
        DRM_AGP_KERN *kern;
 
@@ -70,20 +70,16 @@ int drm_agp_info(drm_device_t * dev, drm_agp_info_t *info)
 }
 EXPORT_SYMBOL(drm_agp_info);
 
-int drm_agp_info_ioctl(struct inode *inode, struct file *filp,
-                unsigned int cmd, unsigned long arg)
+int drm_agp_info_ioctl(struct drm_device *dev, void *data,
+                      struct drm_file *file_priv)
 {
-       drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->head->dev;
-       drm_agp_info_t info;
+       struct drm_agp_info *info = data;
        int err;
 
-       err = drm_agp_info(dev, &info);
+       err = drm_agp_info(dev, info);
        if (err)
                return err;
-       
-       if (copy_to_user((drm_agp_info_t __user *) arg, &info, sizeof(info)))
-               return -EFAULT;
+
        return 0;
 }
 
@@ -96,7 +92,7 @@ int drm_agp_info_ioctl(struct inode *inode, struct file *filp,
  * Verifies the AGP device hasn't been acquired before and calls
  * \c agp_backend_acquire.
  */
-int drm_agp_acquire(drm_device_t * dev)
+int drm_agp_acquire(struct drm_device * dev)
 {
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11)
        int retcode;
@@ -106,10 +102,6 @@ int drm_agp_acquire(drm_device_t * dev)
                return -ENODEV;
        if (dev->agp->acquired)
                return -EBUSY;
-#ifndef VMAP_4_ARGS
-       if (dev->agp->cant_use_aperture)
-               return -EINVAL;
-#endif
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11)
        if ((retcode = agp_backend_acquire()))
                return retcode;
@@ -127,7 +119,7 @@ EXPORT_SYMBOL(drm_agp_acquire);
  * Acquire the AGP device (ioctl).
  *
  * \param inode device inode.
- * \param filp file pointer.
+ * \param file_priv DRM file private.
  * \param cmd command.
  * \param arg user argument.
  * \return zero on success or a negative number on failure.
@@ -135,12 +127,10 @@ EXPORT_SYMBOL(drm_agp_acquire);
  * Verifies the AGP device hasn't been acquired before and calls
  * \c agp_backend_acquire.
  */
-int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp,
-                         unsigned int cmd, unsigned long arg)
+int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
+                         struct drm_file *file_priv)
 {
-       drm_file_t *priv = filp->private_data;
-       
-       return drm_agp_acquire( (drm_device_t *) priv->head->dev );
+       return drm_agp_acquire((struct drm_device *) file_priv->head->dev);
 }
 
 /**
@@ -151,7 +141,7 @@ int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp,
  *
  * Verifies the AGP device has been acquired and calls \c agp_backend_release.
  */
-int drm_agp_release(drm_device_t *dev)
+int drm_agp_release(struct drm_device *dev)
 {
        if (!dev->agp || !dev->agp->acquired)
                return -EINVAL;
@@ -166,12 +156,9 @@ int drm_agp_release(drm_device_t *dev)
 }
 EXPORT_SYMBOL(drm_agp_release);
 
-int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
-                         unsigned int cmd, unsigned long arg)
+int drm_agp_release_ioctl(struct drm_device *dev, void *data,
+                         struct drm_file *file_priv)
 {
-       drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->head->dev;
-       
        return drm_agp_release(dev);
 }
 
@@ -185,7 +172,7 @@ int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
  * Verifies the AGP device has been acquired but not enabled, and calls
  * \c agp_enable.
  */
-int drm_agp_enable(drm_device_t *dev, drm_agp_mode_t mode)
+int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode)
 {
        if (!dev->agp || !dev->agp->acquired)
                return -EINVAL;
@@ -196,31 +183,24 @@ int drm_agp_enable(drm_device_t *dev, drm_agp_mode_t mode)
 #else
        agp_enable(dev->agp->bridge, mode.mode);
 #endif
-       dev->agp->base = dev->agp->agp_info.aper_base;
        dev->agp->enabled = 1;
        return 0;
 }
 EXPORT_SYMBOL(drm_agp_enable);
 
-int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
-                  unsigned int cmd, unsigned long arg)
+int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
+                        struct drm_file *file_priv)
 {
-       drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->head->dev;
-       drm_agp_mode_t mode;
-
+       struct drm_agp_mode *mode = data;
 
-       if (copy_from_user(&mode, (drm_agp_mode_t __user *) arg, sizeof(mode)))
-               return -EFAULT;
-
-       return drm_agp_enable(dev, mode);
+       return drm_agp_enable(dev, *mode);
 }
 
 /**
  * Allocate AGP memory.
  *
  * \param inode device inode.
- * \param filp file pointer.
+ * \param file_priv file private pointer.
  * \param cmd command.
  * \param arg pointer to a drm_agp_buffer structure.
  * \return zero on success or a negative number on failure.
@@ -228,9 +208,9 @@ int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
  * Verifies the AGP device is present and has been acquired, allocates the
  * memory via alloc_agp() and creates a drm_agp_mem entry for it.
  */
-int drm_agp_alloc(drm_device_t *dev, drm_agp_buffer_t *request)
+int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)
 {
-       drm_agp_mem_t *entry;
+       struct drm_agp_mem *entry;
        DRM_AGP_MEM *memory;
        unsigned long pages;
        u32 type;
@@ -253,11 +233,7 @@ int drm_agp_alloc(drm_device_t *dev, drm_agp_buffer_t *request)
        entry->memory = memory;
        entry->bound = 0;
        entry->pages = pages;
-       entry->prev = NULL;
-       entry->next = dev->agp->memory;
-       if (dev->agp->memory)
-               dev->agp->memory->prev = entry;
-       dev->agp->memory = entry;
+       list_add(&entry->head, &dev->agp->memory);
 
        request->handle = entry->handle;
        request->physical = memory->physical;
@@ -267,33 +243,12 @@ int drm_agp_alloc(drm_device_t *dev, drm_agp_buffer_t *request)
 EXPORT_SYMBOL(drm_agp_alloc);
 
 
-int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp,
-                       unsigned int cmd, unsigned long arg)
+int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
+                       struct drm_file *file_priv)
 {
-       drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->head->dev;
-       drm_agp_buffer_t request;
-       drm_agp_buffer_t __user *argp = (void __user *)arg;
-       int err;
+       struct drm_agp_buffer *request = data;
 
-       if (copy_from_user(&request, argp, sizeof(request)))
-               return -EFAULT;
-
-       err = drm_agp_alloc(dev, &request);
-       if (err)
-               return err;
-
-       if (copy_to_user(argp, &request, sizeof(request))) {
-               drm_agp_mem_t *entry = dev->agp->memory;
-
-               dev->agp->memory = entry->next;
-               dev->agp->memory->prev = NULL;
-               drm_free_agp(entry->memory, entry->pages);
-               drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
-               return -EFAULT;
-       }
-
-       return 0;
+       return drm_agp_alloc(dev, request);
 }
 
 /**
@@ -305,12 +260,12 @@ int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp,
  *
  * Walks through drm_agp_head::memory until finding a matching handle.
  */
-static drm_agp_mem_t *drm_agp_lookup_entry(drm_device_t * dev,
+static struct drm_agp_mem *drm_agp_lookup_entry(struct drm_device * dev,
                                           unsigned long handle)
 {
-       drm_agp_mem_t *entry;
+       struct drm_agp_mem *entry;
 
-       for (entry = dev->agp->memory; entry; entry = entry->next) {
+       list_for_each_entry(entry, &dev->agp->memory, head) {
                if (entry->handle == handle)
                        return entry;
        }
@@ -321,7 +276,7 @@ static drm_agp_mem_t *drm_agp_lookup_entry(drm_device_t * dev,
  * Unbind AGP memory from the GATT (ioctl).
  *
  * \param inode device inode.
- * \param filp file pointer.
+ * \param file_priv DRM file private.
  * \param cmd command.
  * \param arg pointer to a drm_agp_binding structure.
  * \return zero on success or a negative number on failure.
@@ -329,9 +284,9 @@ static drm_agp_mem_t *drm_agp_lookup_entry(drm_device_t * dev,
  * Verifies the AGP device is present and acquired, looks-up the AGP memory
  * entry and passes it to the unbind_agp() function.
  */
-int drm_agp_unbind(drm_device_t *dev, drm_agp_binding_t *request)
+int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request)
 {
-       drm_agp_mem_t *entry;
+       struct drm_agp_mem *entry;
        int ret;
 
        if (!dev->agp || !dev->agp->acquired)
@@ -348,18 +303,12 @@ int drm_agp_unbind(drm_device_t *dev, drm_agp_binding_t *request)
 EXPORT_SYMBOL(drm_agp_unbind);
 
 
-int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp,
-                        unsigned int cmd, unsigned long arg)
+int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
+                        struct drm_file *file_priv)
 {
-       drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->head->dev;
-       drm_agp_binding_t request;
+       struct drm_agp_binding *request = data;
 
-       if (copy_from_user
-           (&request, (drm_agp_binding_t __user *) arg, sizeof(request)))
-               return -EFAULT;
-
-       return drm_agp_unbind(dev, &request);
+       return drm_agp_unbind(dev, request);
 }
 
 
@@ -367,7 +316,7 @@ int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp,
  * Bind AGP memory into the GATT (ioctl)
  *
  * \param inode device inode.
- * \param filp file pointer.
+ * \param file_priv DRM file private.
  * \param cmd command.
  * \param arg pointer to a drm_agp_binding structure.
  * \return zero on success or a negative number on failure.
@@ -376,9 +325,9 @@ int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp,
  * is currently bound into the GATT. Looks-up the AGP memory entry and passes
  * it to bind_agp() function.
  */
-int drm_agp_bind(drm_device_t *dev, drm_agp_binding_t *request)
+int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request)
 {
-       drm_agp_mem_t *entry;
+       struct drm_agp_mem *entry;
        int retcode;
        int page;
 
@@ -399,18 +348,12 @@ int drm_agp_bind(drm_device_t *dev, drm_agp_binding_t *request)
 EXPORT_SYMBOL(drm_agp_bind);
 
 
-int drm_agp_bind_ioctl(struct inode *inode, struct file *filp,
-                      unsigned int cmd, unsigned long arg)
+int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
+                      struct drm_file *file_priv)
 {
-       drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->head->dev;
-       drm_agp_binding_t request;
-
-       if (copy_from_user
-           (&request, (drm_agp_binding_t __user *) arg, sizeof(request)))
-               return -EFAULT;
+       struct drm_agp_binding *request = data;
 
-       return drm_agp_bind(dev, &request);
+       return drm_agp_bind(dev, request);
 }
 
 
@@ -418,7 +361,7 @@ int drm_agp_bind_ioctl(struct inode *inode, struct file *filp,
  * Free AGP memory (ioctl).
  *
  * \param inode device inode.
- * \param filp file pointer.
+ * \param file_priv DRM file private.
  * \param cmd command.
  * \param arg pointer to a drm_agp_buffer structure.
  * \return zero on success or a negative number on failure.
@@ -428,9 +371,9 @@ int drm_agp_bind_ioctl(struct inode *inode, struct file *filp,
  * unbind_agp(). Frees it via free_agp() as well as the entry itself
  * and unlinks from the doubly linked list it's inserted in.
  */
-int drm_agp_free(drm_device_t *dev, drm_agp_buffer_t *request)
+int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request)
 {
-       drm_agp_mem_t *entry;
+       struct drm_agp_mem *entry;
 
        if (!dev->agp || !dev->agp->acquired)
                return -EINVAL;
@@ -439,13 +382,7 @@ int drm_agp_free(drm_device_t *dev, drm_agp_buffer_t *request)
        if (entry->bound)
                drm_unbind_agp(entry->memory);
 
-       if (entry->prev)
-               entry->prev->next = entry->next;
-       else
-               dev->agp->memory = entry->next;
-
-       if (entry->next)
-               entry->next->prev = entry->prev;
+       list_del(&entry->head);
 
        drm_free_agp(entry->memory, entry->pages);
        drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
@@ -455,18 +392,12 @@ EXPORT_SYMBOL(drm_agp_free);
 
 
 
-int drm_agp_free_ioctl(struct inode *inode, struct file *filp,
-                      unsigned int cmd, unsigned long arg)
+int drm_agp_free_ioctl(struct drm_device *dev, void *data,
+                      struct drm_file *file_priv)
 {
-       drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->head->dev;
-       drm_agp_buffer_t request;
+       struct drm_agp_buffer *request = data;
 
-       if (copy_from_user
-           (&request, (drm_agp_buffer_t __user *) arg, sizeof(request)))
-               return -EFAULT;
-
-       return drm_agp_free(dev, &request);
+       return drm_agp_free(dev, request);
 }
 
 
@@ -479,9 +410,9 @@ int drm_agp_free_ioctl(struct inode *inode, struct file *filp,
  * via the inter_module_* functions. Creates and initializes a drm_agp_head
  * structure.
  */
-drm_agp_head_t *drm_agp_init(drm_device_t *dev)
+struct drm_agp_head *drm_agp_init(struct drm_device *dev)
 {
-       drm_agp_head_t *head = NULL;
+       struct drm_agp_head *head = NULL;
 
        if (!(head = drm_alloc(sizeof(*head), DRM_MEM_AGPLISTS)))
                return NULL;
@@ -495,7 +426,7 @@ drm_agp_head_t *drm_agp_init(drm_device_t *dev)
                if (!(head->bridge = agp_backend_acquire(dev->pdev))) {
                        drm_free(head, sizeof(*head), DRM_MEM_AGPLISTS);
                        return NULL;
-       }
+               }
                agp_copy_info(head->bridge, &head->agp_info);
                agp_backend_release(head->bridge);
        } else {
@@ -506,9 +437,10 @@ drm_agp_head_t *drm_agp_init(drm_device_t *dev)
                drm_free(head, sizeof(*head), DRM_MEM_AGPLISTS);
                return NULL;
        }
-       head->memory = NULL;
+       INIT_LIST_HEAD(&head->memory);
        head->cant_use_aperture = head->agp_info.cant_use_aperture;
        head->page_mask = head->agp_info.page_mask;
+       head->base = head->agp_info.aper_base;
        return head;
 }
 
@@ -552,178 +484,179 @@ int drm_agp_unbind_memory(DRM_AGP_MEM * handle)
        return agp_unbind_memory(handle);
 }
 
+
+
 /*
  * AGP ttm backend interface.
  */
 
-static int drm_agp_needs_cache_adjust_true(drm_ttm_backend_t *backend) {
-       return TRUE;
-}
+#ifndef AGP_USER_TYPES
+#define AGP_USER_TYPES (1 << 16)
+#define AGP_USER_MEMORY (AGP_USER_TYPES)
+#define AGP_USER_CACHED_MEMORY (AGP_USER_TYPES + 1)
+#endif
+#define AGP_REQUIRED_MAJOR 0
+#define AGP_REQUIRED_MINOR 102
 
-static int drm_agp_needs_cache_adjust_false(drm_ttm_backend_t *backend) {
-       return FALSE;
+static int drm_agp_needs_unbind_cache_adjust(struct drm_ttm_backend *backend)
+{
+       return ((backend->flags & DRM_BE_FLAG_BOUND_CACHED) ? 0 : 1);
 }
 
-#define AGP_MEM_USER (1 << 16)
-#define AGP_MEM_UCACHED (2 << 16)
-
-static int drm_agp_populate(drm_ttm_backend_t *backend, unsigned long num_pages, 
-                           struct page **pages) {
 
-       drm_agp_ttm_priv *agp_priv = (drm_agp_ttm_priv *) backend->private;
+static int drm_agp_populate(struct drm_ttm_backend *backend,
+                           unsigned long num_pages, struct page **pages)
+{
+       struct drm_agp_ttm_backend *agp_be =
+               container_of(backend, struct drm_agp_ttm_backend, backend);
        struct page **cur_page, **last_page = pages + num_pages;
        DRM_AGP_MEM *mem;
 
+       if (drm_alloc_memctl(num_pages * sizeof(void *)))
+               return -1;
+
        DRM_DEBUG("drm_agp_populate_ttm\n");
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11)
-       mem = drm_agp_allocate_memory(num_pages, agp_priv->mem_type);
+       mem = drm_agp_allocate_memory(num_pages, AGP_USER_MEMORY);
 #else
-       mem = drm_agp_allocate_memory(agp_priv->bridge, num_pages, agp_priv->mem_type);
+       mem = drm_agp_allocate_memory(agp_be->bridge, num_pages, AGP_USER_MEMORY);
 #endif
-       if (!mem) 
+       if (!mem) {
+               drm_free_memctl(num_pages *sizeof(void *));
                return -1;
+       }
 
        DRM_DEBUG("Current page count is %ld\n", (long) mem->page_count);
        mem->page_count = 0;
-       for (cur_page = pages; cur_page < last_page; ++cur_page) {
+       for (cur_page = pages; cur_page < last_page; ++cur_page)
                mem->memory[mem->page_count++] = phys_to_gart(page_to_phys(*cur_page));
-       }
-       agp_priv->mem = mem;
+       agp_be->mem = mem;
        return 0;
 }
 
-static int drm_agp_bind_ttm(drm_ttm_backend_t *backend, unsigned long offset) {
-
-       drm_agp_ttm_priv *agp_priv = (drm_agp_ttm_priv *) backend->private;
-       DRM_AGP_MEM *mem = agp_priv->mem;
+static int drm_agp_bind_ttm(struct drm_ttm_backend *backend,
+                           struct drm_bo_mem_reg *bo_mem)
+{
+       struct drm_agp_ttm_backend *agp_be =
+               container_of(backend, struct drm_agp_ttm_backend, backend);
+       DRM_AGP_MEM *mem = agp_be->mem;
        int ret;
+       int snooped = (bo_mem->flags & DRM_BO_FLAG_CACHED) && !(bo_mem->flags & DRM_BO_FLAG_CACHED_MAPPED);
 
        DRM_DEBUG("drm_agp_bind_ttm\n");
-       mem->is_flushed = FALSE;
-       ret = drm_agp_bind_memory(mem, offset);
-       if (ret) {
+       mem->is_flushed = TRUE;
+       mem->type = AGP_USER_MEMORY;
+       /* CACHED MAPPED implies not snooped memory */
+       if (snooped)
+               mem->type = AGP_USER_CACHED_MEMORY;
+
+       ret = drm_agp_bind_memory(mem, bo_mem->mm_node->start);
+       if (ret)
                DRM_ERROR("AGP Bind memory failed\n");
-       }
+
+       DRM_FLAG_MASKED(backend->flags, (bo_mem->flags & DRM_BO_FLAG_CACHED) ?
+                       DRM_BE_FLAG_BOUND_CACHED : 0,
+                       DRM_BE_FLAG_BOUND_CACHED);
        return ret;
 }
 
-static int drm_agp_unbind_ttm(drm_ttm_backend_t *backend) {
-
-       drm_agp_ttm_priv *agp_priv = (drm_agp_ttm_priv *) backend->private;
+static int drm_agp_unbind_ttm(struct drm_ttm_backend *backend)
+{
+       struct drm_agp_ttm_backend *agp_be =
+               container_of(backend, struct drm_agp_ttm_backend, backend);
 
        DRM_DEBUG("drm_agp_unbind_ttm\n");
-       if (agp_priv->mem->is_bound)
-               return drm_agp_unbind_memory(agp_priv->mem);
+       if (agp_be->mem->is_bound)
+               return drm_agp_unbind_memory(agp_be->mem);
        else
                return 0;
 }
 
-static void drm_agp_clear_ttm(drm_ttm_backend_t *backend) {
-
-       drm_agp_ttm_priv *agp_priv = (drm_agp_ttm_priv *) backend->private;
-       DRM_AGP_MEM *mem = agp_priv->mem;
+static void drm_agp_clear_ttm(struct drm_ttm_backend *backend)
+{
+       struct drm_agp_ttm_backend *agp_be =
+               container_of(backend, struct drm_agp_ttm_backend, backend);
+       DRM_AGP_MEM *mem = agp_be->mem;
 
        DRM_DEBUG("drm_agp_clear_ttm\n");
        if (mem) {
-               backend->unbind(backend);
+               unsigned long num_pages = mem->page_count;
+               backend->func->unbind(backend);
                agp_free_memory(mem);
+               drm_free_memctl(num_pages * sizeof(void *));
        }
-
-       agp_priv->mem = NULL;
+       agp_be->mem = NULL;
 }
 
-static void drm_agp_destroy_ttm(drm_ttm_backend_t *backend) {
+static void drm_agp_destroy_ttm(struct drm_ttm_backend *backend)
+{
+       struct drm_agp_ttm_backend *agp_be;
 
-       drm_agp_ttm_priv *agp_priv; 
-       
        if (backend) {
                DRM_DEBUG("drm_agp_destroy_ttm\n");
-               agp_priv = (drm_agp_ttm_priv *) backend->private;
-               if (agp_priv) {
-                       if (agp_priv->mem) {
-                               backend->clear(backend);
-                       }
-                       drm_free(agp_priv, sizeof(*agp_priv), DRM_MEM_MAPPINGS);
+               agp_be = container_of(backend, struct drm_agp_ttm_backend, backend);
+               if (agp_be) {
+                       if (agp_be->mem)
+                               backend->func->clear(backend);
+                       drm_ctl_free(agp_be, sizeof(*agp_be), DRM_MEM_TTM);
                }
-               if (backend->needs_free)
-                       drm_free(backend, sizeof(*backend), DRM_MEM_MAPPINGS);
        }
 }
-       
 
-drm_ttm_backend_t *drm_agp_init_ttm_uncached(struct drm_device *dev,
-                                            drm_ttm_backend_t *backend) {
+static struct drm_ttm_backend_func agp_ttm_backend = {
+       .needs_ub_cache_adjust = drm_agp_needs_unbind_cache_adjust,
+       .populate = drm_agp_populate,
+       .clear = drm_agp_clear_ttm,
+       .bind = drm_agp_bind_ttm,
+       .unbind = drm_agp_unbind_ttm,
+       .destroy =  drm_agp_destroy_ttm,
+};
 
-        drm_ttm_backend_t *agp_be;
-       drm_agp_ttm_priv *agp_priv;
+struct drm_ttm_backend *drm_agp_init_ttm(struct drm_device *dev)
+{
 
-       agp_be = (backend != NULL) ? backend:
-               drm_calloc(1, sizeof(*agp_be), DRM_MEM_MAPPINGS);
+       struct drm_agp_ttm_backend *agp_be;
+       struct agp_kern_info *info;
 
-       if (!agp_be)
+       if (!dev->agp) {
+               DRM_ERROR("AGP is not initialized.\n");
                return NULL;
-       
-       agp_priv = drm_calloc(1, sizeof(agp_priv), DRM_MEM_MAPPINGS);
-       
-       if (!agp_priv) {
-               drm_free(agp_be, sizeof(*agp_be), DRM_MEM_MAPPINGS);
+       }
+       info = &dev->agp->agp_info;
+
+       if (info->version.major != AGP_REQUIRED_MAJOR ||
+           info->version.minor < AGP_REQUIRED_MINOR) {
+               DRM_ERROR("Wrong agpgart version %d.%d\n"
+                         "\tYou need at least version %d.%d.\n",
+                         info->version.major,
+                         info->version.minor,
+                         AGP_REQUIRED_MAJOR,
+                         AGP_REQUIRED_MINOR);
                return NULL;
        }
-       
-       agp_priv->mem = NULL;
-       agp_priv->mem_type = AGP_MEM_USER;
-       agp_priv->bridge = dev->agp->bridge;
-       agp_priv->populated = FALSE;
-       agp_be->aperture_base = dev->agp->agp_info.aper_base;
-       agp_be->private = (void *) agp_priv;
-       agp_be->needs_cache_adjust = drm_agp_needs_cache_adjust_true;
-       agp_be->populate = drm_agp_populate;
-       agp_be->clear = drm_agp_clear_ttm;
-       agp_be->bind = drm_agp_bind_ttm;
-       agp_be->unbind = drm_agp_unbind_ttm;
-       agp_be->destroy = drm_agp_destroy_ttm;
-       agp_be->needs_free = (backend == NULL);
-       agp_be->drm_map_type = _DRM_AGP;
-       return agp_be;
-}
-EXPORT_SYMBOL(drm_agp_init_ttm_uncached);
-
-drm_ttm_backend_t *drm_agp_init_ttm_cached(struct drm_device *dev, 
-                                          drm_ttm_backend_t *backend) {
 
-        drm_ttm_backend_t *agp_be;
-       drm_agp_ttm_priv *agp_priv;
-
-       
-       agp_be = (backend != NULL) ? backend:
-               drm_calloc(1, sizeof(*agp_be), DRM_MEM_MAPPINGS);
 
+       agp_be = drm_ctl_calloc(1, sizeof(*agp_be), DRM_MEM_TTM);
        if (!agp_be)
                return NULL;
-       
-       agp_priv = drm_calloc(1, sizeof(agp_priv), DRM_MEM_MAPPINGS);
-       
-       if (!agp_priv) {
-               drm_free(agp_be, sizeof(*agp_be), DRM_MEM_MAPPINGS);
-               return NULL;
-       }
-       
-       agp_priv->mem = NULL;
-       agp_priv->mem_type = AGP_MEM_UCACHED;
-       agp_priv->bridge = dev->agp->bridge;
-       agp_priv->populated = FALSE;
-       agp_be->aperture_base = dev->agp->agp_info.aper_base;
-       agp_be->private = (void *) agp_priv;
-       agp_be->needs_cache_adjust = drm_agp_needs_cache_adjust_false;
-       agp_be->populate = drm_agp_populate;
-       agp_be->clear = drm_agp_clear_ttm;
-       agp_be->bind = drm_agp_bind_ttm;
-       agp_be->unbind = drm_agp_unbind_ttm;
-       agp_be->destroy = drm_agp_destroy_ttm;
-       agp_be->needs_free = (backend == NULL);
-       agp_be->drm_map_type = _DRM_AGP;
-       return agp_be;
+
+       agp_be->mem = NULL;
+
+       agp_be->bridge = dev->agp->bridge;
+       agp_be->populated = FALSE;
+       agp_be->backend.func = &agp_ttm_backend;
+       agp_be->backend.dev = dev;
+
+       return &agp_be->backend;
 }
-EXPORT_SYMBOL(drm_agp_init_ttm_cached);
+EXPORT_SYMBOL(drm_agp_init_ttm);
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
+void drm_agp_chipset_flush(struct drm_device *dev)
+{
+       agp_flush_chipset(dev->agp->bridge);
+}
+EXPORT_SYMBOL(drm_agp_flush_chipset);
+#endif
 
 #endif                         /* __OS_HAS_AGP */