drm/ttm: rename ttm_mem_type_manager -> ttm_resource_manager.

[linux-2.6-microblaze.git] / drivers / gpu / drm / nouveau / nouveau_ttm.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 84387c8..78b5a87 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -32,13 +32,13 @@
 #include <core/tegra.h>
 
 static void
-nouveau_manager_del(struct ttm_mem_type_manager *man, struct ttm_mem_reg *reg)
+nouveau_manager_del(struct ttm_resource_manager *man, struct ttm_mem_reg *reg)
 {
        nouveau_mem_del(reg);
 }
 
 static int
-nouveau_vram_manager_new(struct ttm_mem_type_manager *man,
+nouveau_vram_manager_new(struct ttm_resource_manager *man,
                         struct ttm_buffer_object *bo,
                         const struct ttm_place *place,
                         struct ttm_mem_reg *reg)
@@ -63,13 +63,13 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man,
        return 0;
 }
 
-const struct ttm_mem_type_manager_func nouveau_vram_manager = {
+const struct ttm_resource_manager_func nouveau_vram_manager = {
        .get_node = nouveau_vram_manager_new,
        .put_node = nouveau_manager_del,
 };
 
 static int
-nouveau_gart_manager_new(struct ttm_mem_type_manager *man,
+nouveau_gart_manager_new(struct ttm_resource_manager *man,
                         struct ttm_buffer_object *bo,
                         const struct ttm_place *place,
                         struct ttm_mem_reg *reg)
@@ -86,13 +86,13 @@ nouveau_gart_manager_new(struct ttm_mem_type_manager *man,
        return 0;
 }
 
-const struct ttm_mem_type_manager_func nouveau_gart_manager = {
+const struct ttm_resource_manager_func nouveau_gart_manager = {
        .get_node = nouveau_gart_manager_new,
        .put_node = nouveau_manager_del,
 };
 
 static int
-nv04_gart_manager_new(struct ttm_mem_type_manager *man,
+nv04_gart_manager_new(struct ttm_resource_manager *man,
                      struct ttm_buffer_object *bo,
                      const struct ttm_place *place,
                      struct ttm_mem_reg *reg)
@@ -118,7 +118,7 @@ nv04_gart_manager_new(struct ttm_mem_type_manager *man,
        return 0;
 }
 
-const struct ttm_mem_type_manager_func nv04_gart_manager = {
+const struct ttm_resource_manager_func nv04_gart_manager = {
        .get_node = nv04_gart_manager_new,
        .put_node = nouveau_manager_del,
 };
@@ -160,7 +160,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
        if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
                /* Some BARs do not support being ioremapped WC */
                const u8 type = mmu->type[drm->ttm.type_vram].type;
-               struct ttm_mem_type_manager *man = kzalloc(sizeof(*man), GFP_KERNEL);
+               struct ttm_resource_manager *man = kzalloc(sizeof(*man), GFP_KERNEL);
                if (!man)
                        return -ENOMEM;
 
@@ -175,10 +175,10 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
                man->func = &nouveau_vram_manager;
                man->use_io_reserve_lru = true;
 
-               ttm_mem_type_manager_init(man,
+               ttm_resource_manager_init(man,
                                          drm->gem.vram_available >> PAGE_SHIFT);
                ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, man);
-               ttm_mem_type_manager_set_used(man, true);
+               ttm_resource_manager_set_used(man, true);
                return 0;
        } else {
                return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_VRAM,
@@ -191,12 +191,12 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
 static void
 nouveau_ttm_fini_vram(struct nouveau_drm *drm)
 {
-       struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
+       struct ttm_resource_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM);
 
        if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
-               ttm_mem_type_manager_set_used(man, false);
-               ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
-               ttm_mem_type_manager_cleanup(man);
+               ttm_resource_manager_set_used(man, false);
+               ttm_resource_manager_force_list_clean(&drm->ttm.bdev, man);
+               ttm_resource_manager_cleanup(man);
                ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, NULL);
                kfree(man);
        } else
@@ -206,10 +206,10 @@ nouveau_ttm_fini_vram(struct nouveau_drm *drm)
 static int
 nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 {
-       struct ttm_mem_type_manager *man;
+       struct ttm_resource_manager *man;
        unsigned long size_pages = drm->gem.gart_available >> PAGE_SHIFT;
        unsigned available_caching, default_caching;
-       const struct ttm_mem_type_manager_func *func = NULL;
+       const struct ttm_resource_manager_func *func = NULL;
        if (drm->agp.bridge) {
                available_caching = TTM_PL_FLAG_UNCACHED |
                        TTM_PL_FLAG_WC;
@@ -237,24 +237,24 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
        man->available_caching = available_caching;
        man->default_caching = default_caching;
        man->use_tt = true;
-       ttm_mem_type_manager_init(man, size_pages);
+       ttm_resource_manager_init(man, size_pages);
        ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, man);
-       ttm_mem_type_manager_set_used(man, true);
+       ttm_resource_manager_set_used(man, true);
        return 0;
 }
 
 static void
 nouveau_ttm_fini_gtt(struct nouveau_drm *drm)
 {
-       struct ttm_mem_type_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_TT);
+       struct ttm_resource_manager *man = ttm_manager_type(&drm->ttm.bdev, TTM_PL_TT);
 
        if (drm->client.device.info.family < NV_DEVICE_INFO_V0_TESLA &&
            drm->agp.bridge)
                ttm_range_man_fini(&drm->ttm.bdev, TTM_PL_TT);
        else {
-               ttm_mem_type_manager_set_used(man, false);
-               ttm_mem_type_manager_force_list_clean(&drm->ttm.bdev, man);
-               ttm_mem_type_manager_cleanup(man);
+               ttm_resource_manager_set_used(man, false);
+               ttm_resource_manager_force_list_clean(&drm->ttm.bdev, man);
+               ttm_resource_manager_cleanup(man);
                ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, NULL);
                kfree(man);
        }