1 files changed, 10 insertions, 11 deletions

diff --git a/linux-core/ati_pcigart.c b/linux-core/ati_pcigart.c
index ebf19a2b..64e0e758 100644
--- a/linux-core/ati_pcigart.c
+++ b/linux-core/ati_pcigart.c
@@ -120,9 +120,9 @@ static void drm_ati_free_pcigart_table(void *address, int order)
 	free_pages((unsigned long)address, order);
 }
 
-int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
+int drm_ati_pcigart_cleanup(struct drm_device *dev, struct ati_pcigart_info *gart_info)
 {
-	drm_sg_mem_t *entry = dev->sg;
+	struct drm_sg_mem *entry = dev->sg;
 	unsigned long pages;
 	int i;
 	int order;
@@ -171,9 +171,9 @@ int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
 }
 EXPORT_SYMBOL(drm_ati_pcigart_cleanup);
 
-int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
+int drm_ati_pcigart_init(struct drm_device *dev, struct ati_pcigart_info *gart_info)
 {
-	drm_sg_mem_t *entry = dev->sg;
+	struct drm_sg_mem *entry = dev->sg;
 	void *address = NULL;
 	unsigned long pages;
 	u32 *pci_gart, page_base, bus_address = 0;
@@ -286,9 +286,8 @@ static int ati_pcigart_populate(drm_ttm_backend_t *backend,
 	return 0;
 }
 
-static int ati_pcigart_bind_ttm(drm_ttm_backend_t *backend,
-				unsigned long offset,
-				int cached)
+static int ati_pcigart_bind_ttm(struct drm_ttm_backend *backend,
+				struct drm_bo_mem_reg *bo_mem)
 {
 	ati_pcigart_ttm_backend_t *atipci_be =
 		container_of(backend, ati_pcigart_ttm_backend_t, backend);
@@ -297,9 +296,10 @@ static int ati_pcigart_bind_ttm(drm_ttm_backend_t *backend,
 	struct ati_pcigart_info *info = atipci_be->gart_info;
 	u32 *pci_gart;
 	u32 page_base;
+	unsigned long offset = bo_mem->mm_node->start;
 	pci_gart = info->addr;
 
-	DRM_ERROR("Offset is %08lX\n", offset);
+	DRM_ERROR("Offset is %08lX\n", bo_mem->mm_node->start);
         j = offset;
         while (j < (offset + atipci_be->num_pages)) {
 		if (get_page_base_from_table(info, pci_gart+j))
@@ -382,7 +382,7 @@ static void ati_pcigart_destroy_ttm(drm_ttm_backend_t *backend)
 	}
 }
 
-static drm_ttm_backend_func_t ati_pcigart_ttm_backend = 
+static struct drm_ttm_backend_func ati_pcigart_ttm_backend = 
 {
 	.needs_ub_cache_adjust = ati_pcigart_needs_unbind_cache_adjust,
 	.populate = ati_pcigart_populate,
@@ -392,7 +392,7 @@ static drm_ttm_backend_func_t ati_pcigart_ttm_backend =
 	.destroy =  ati_pcigart_destroy_ttm,
 };
 
-drm_ttm_backend_t *ati_pcigart_init_ttm(struct drm_device *dev, struct ati_pcigart_info *info, void (*gart_flush_fn)(struct drm_device *dev))
+struct drm_ttm_backend *ati_pcigart_init_ttm(struct drm_device *dev, struct ati_pcigart_info *info, void (*gart_flush_fn)(struct drm_device *dev))
 {
 	ati_pcigart_ttm_backend_t *atipci_be;
 
@@ -402,7 +402,6 @@ drm_ttm_backend_t *ati_pcigart_init_ttm(struct drm_device *dev, struct ati_pciga
 	
 	atipci_be->populated = 0;
 	atipci_be->backend.func = &ati_pcigart_ttm_backend;
-	atipci_be->backend.mem_type = DRM_BO_MEM_TT;
 	atipci_be->gart_info = info;
 	atipci_be->gart_flush_fn = gart_flush_fn;
 	atipci_be->dev = dev;