radeon: add setup for PCIE GART ttm

diff --git a/linux-core/ati_pcigart.c b/linux-core/ati_pcigart.c
index f3f9112..108e187 100644 (file)
--- a/linux-core/ati_pcigart.c
+++ b/linux-core/ati_pcigart.c
@@ -239,8 +239,22 @@ static int ati_pcigart_populate(drm_ttm_backend_t *backend,
                                struct page **pages)
 {
        ati_pcigart_ttm_priv *atipci_priv = (ati_pcigart_ttm_priv *)backend->private;   
+       struct page **cur_page, **last_page = pages + num_pages;
+       struct ati_pcigart_memory *mem;
 
-       return -1;
+       DRM_DEBUG("%d\n", num_pages);
+       if (drm_alloc_memctl(num_pages * sizeof(void *)))
+               return -1;
+
+       mem = drm_alloc(sizeof(struct ati_pcigart_memory), DRM_MEM_MAPPINGS);
+       if (!mem) {
+               drm_free_memctl(num_pages * sizeof(void *));
+               return -1;
+       }
+
+       mem->page_count = num_pages;
+       atipci_priv->mem = mem;
+       return 0;
 }
 
 static int ati_pcigart_bind_ttm(drm_ttm_backend_t *backend,
@@ -249,6 +263,7 @@ static int ati_pcigart_bind_ttm(drm_ttm_backend_t *backend,
 {
        ati_pcigart_ttm_priv *atipci_priv = (ati_pcigart_ttm_priv *)backend->private;
 
+       DRM_DEBUG("\n");
        return -1;
 }
 
@@ -256,12 +271,24 @@ static int ati_pcigart_unbind_ttm(drm_ttm_backend_t *backend)
 {
        ati_pcigart_ttm_priv *atipci_priv = (ati_pcigart_ttm_priv *)backend->private;
        
+       DRM_DEBUG("\n");
        return -1;
 }
 
 static void ati_pcigart_clear_ttm(drm_ttm_backend_t *backend)
 {
        ati_pcigart_ttm_priv *atipci_priv = (ati_pcigart_ttm_priv *)backend->private;
+       struct ati_pcigart_memory *mem = atipci_priv->mem;
+
+       DRM_DEBUG("\n");        
+       if (mem) {
+               unsigned long num_pages = mem->page_count;
+               backend->unbind(backend);
+               /* free test */
+               drm_free(mem, sizeof(struct ati_pcigart_memory), DRM_MEM_MAPPINGS);
+               drm_free_memctl(num_pages * sizeof(void *));
+       }
+       atipci_priv->mem = NULL;
 }
 
 static void ati_pcigart_destroy_ttm(drm_ttm_backend_t *backend)
@@ -272,6 +299,9 @@ static void ati_pcigart_destroy_ttm(drm_ttm_backend_t *backend)
                DRM_DEBUG("\n");
                atipci_priv = (ati_pcigart_ttm_priv *)backend->private;
                if (atipci_priv) {
+                       if (atipci_priv->mem) {
+                               backend->clear(backend);
+                       }
                        drm_ctl_free(atipci_priv, sizeof(*atipci_priv), DRM_MEM_MAPPINGS);
                        backend->private = NULL;
                }

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index b6da692..3ddd405 100644 (file)
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -840,8 +840,16 @@ typedef struct drm_agp_ttm_priv {
 } drm_agp_ttm_priv;
 #endif
 
+#define ATI_PCIGART_FLAG_VMALLOC 1
+struct ati_pcigart_memory {
+       size_t page_count;
+       unsigned long *memory;
+       int flags;
+};
+
 typedef struct ati_pcigart_ttm_priv {
        int populated;
+       struct ati_pcigart_memory *mem;
 } ati_pcigart_ttm_priv;
 
 static __inline__ int drm_core_check_feature(struct drm_device *dev,

diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index d5a1456..dd38760 100644 (file)
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -80,6 +80,8 @@ uint32_t radeon_evict_mask(drm_buffer_object_t *bo)
 int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
                         drm_mem_type_manager_t * man)
 {
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+
        switch (type) {
        case DRM_BO_MEM_LOCAL:
                man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
@@ -87,17 +89,25 @@ int radeon_init_mem_type(drm_device_t * dev, uint32_t type,
                man->drm_bus_maptype = 0;
                break;
        case DRM_BO_MEM_TT:
-               if (!(drm_core_has_AGP(dev) && dev->agp)) {
-                       DRM_ERROR("AGP is not enabled for memory type %u\n",
-                                 (unsigned)type);
-                       return -EINVAL;
+               if (dev_priv->flags & RADEON_IS_AGP) {
+                       if (!(drm_core_has_AGP(dev) && dev->agp)) {
+                               DRM_ERROR("AGP is not enabled for memory type %u\n",
+                                         (unsigned)type);
+                               return -EINVAL;
+                       }
+                       man->io_offset = dev->agp->agp_info.aper_base;
+                       man->io_size = dev->agp->agp_info.aper_size * 1024 * 1024;
+                       man->io_addr = NULL;
+                       man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
+                               _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
+                       man->drm_bus_maptype = _DRM_AGP;
+               } else {
+                       man->io_offset = 0;
+                       man->io_size = dev_priv->gart_size;
+                       man->io_addr = NULL;
+                       man->flags = _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_MEMTYPE_MAPPABLE;
+                       man->drm_bus_maptype = _DRM_SCATTER_GATHER;
                }
-               man->io_offset = dev->agp->agp_info.aper_base;
-               man->io_size = dev->agp->agp_info.aper_size * 1024 * 1024;
-               man->io_addr = NULL;
-               man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE |
-                   _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP;
-               man->drm_bus_maptype = _DRM_AGP;
                break;
        default:
                DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);