drm/ttm: s/FLAG_SG/FLAG_EXTERNAL/

[linux-2.6-microblaze.git] / drivers / gpu / drm / ttm / ttm_tt.c

diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index 980ecb0..86f31fd 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -68,12 +68,12 @@ int ttm_tt_create(struct ttm_buffer_object *bo, bool zero_alloc)
        switch (bo->type) {
        case ttm_bo_type_device:
                if (zero_alloc)
-                       page_flags |= TTM_PAGE_FLAG_ZERO_ALLOC;
+                       page_flags |= TTM_TT_FLAG_ZERO_ALLOC;
                break;
        case ttm_bo_type_kernel:
                break;
        case ttm_bo_type_sg:
-               page_flags |= TTM_PAGE_FLAG_SG;
+               page_flags |= TTM_TT_FLAG_EXTERNAL;
                break;
        default:
                pr_err("Illegal buffer object type\n");
@@ -156,7 +156,7 @@ EXPORT_SYMBOL(ttm_tt_init);
 
 void ttm_tt_fini(struct ttm_tt *ttm)
 {
-       WARN_ON(ttm->page_flags & TTM_PAGE_FLAG_PRIV_POPULATED);
+       WARN_ON(ttm->page_flags & TTM_TT_FLAG_PRIV_POPULATED);
 
        if (ttm->swap_storage)
                fput(ttm->swap_storage);
@@ -178,7 +178,7 @@ int ttm_sg_tt_init(struct ttm_tt *ttm, struct ttm_buffer_object *bo,
 
        ttm_tt_init_fields(ttm, bo, page_flags, caching);
 
-       if (page_flags & TTM_PAGE_FLAG_SG)
+       if (page_flags & TTM_TT_FLAG_EXTERNAL)
                ret = ttm_sg_tt_alloc_page_directory(ttm);
        else
                ret = ttm_dma_tt_alloc_page_directory(ttm);
@@ -224,7 +224,7 @@ int ttm_tt_swapin(struct ttm_tt *ttm)
 
        fput(swap_storage);
        ttm->swap_storage = NULL;
-       ttm->page_flags &= ~TTM_PAGE_FLAG_SWAPPED;
+       ttm->page_flags &= ~TTM_TT_FLAG_SWAPPED;
 
        return 0;
 
@@ -279,7 +279,7 @@ int ttm_tt_swapout(struct ttm_device *bdev, struct ttm_tt *ttm,
 
        ttm_tt_unpopulate(bdev, ttm);
        ttm->swap_storage = swap_storage;
-       ttm->page_flags |= TTM_PAGE_FLAG_SWAPPED;
+       ttm->page_flags |= TTM_TT_FLAG_SWAPPED;
 
        return ttm->num_pages;
 
@@ -300,7 +300,7 @@ int ttm_tt_populate(struct ttm_device *bdev,
        if (ttm_tt_is_populated(ttm))
                return 0;
 
-       if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
+       if (!(ttm->page_flags & TTM_TT_FLAG_EXTERNAL)) {
                atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
                if (bdev->pool.use_dma32)
                        atomic_long_add(ttm->num_pages,
@@ -325,8 +325,8 @@ int ttm_tt_populate(struct ttm_device *bdev,
        if (ret)
                goto error;
 
-       ttm->page_flags |= TTM_PAGE_FLAG_PRIV_POPULATED;
-       if (unlikely(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {
+       ttm->page_flags |= TTM_TT_FLAG_PRIV_POPULATED;
+       if (unlikely(ttm->page_flags & TTM_TT_FLAG_SWAPPED)) {
                ret = ttm_tt_swapin(ttm);
                if (unlikely(ret != 0)) {
                        ttm_tt_unpopulate(bdev, ttm);
@@ -337,7 +337,7 @@ int ttm_tt_populate(struct ttm_device *bdev,
        return 0;
 
 error:
-       if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
+       if (!(ttm->page_flags & TTM_TT_FLAG_EXTERNAL)) {
                atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
                if (bdev->pool.use_dma32)
                        atomic_long_sub(ttm->num_pages,
@@ -357,14 +357,14 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm)
        else
                ttm_pool_free(&bdev->pool, ttm);
 
-       if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
+       if (!(ttm->page_flags & TTM_TT_FLAG_EXTERNAL)) {
                atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
                if (bdev->pool.use_dma32)
                        atomic_long_sub(ttm->num_pages,
                                        &ttm_dma32_pages_allocated);
        }
 
-       ttm->page_flags &= ~TTM_PAGE_FLAG_PRIV_POPULATED;
+       ttm->page_flags &= ~TTM_TT_FLAG_PRIV_POPULATED;
 }
 
 #ifdef CONFIG_DEBUG_FS