drm/ttm: move fpfn and lpfn into each placement v2

This allows us to more fine grained specify where to place the buffer object.

v2: rebased on drm-next, add bochs changes as well

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

2 files changed, 13 insertions, 9 deletions

diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 957d4fabf1e1..cb91c2acc3cb 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -316,7 +316,7 @@ struct ast_bo {
         struct ttm_placement placement;
         struct ttm_bo_kmap_obj kmap;
         struct drm_gem_object gem;
-        u32 placements[3];
+        struct ttm_place placements[3];
         int pin_count;
 };
 #define gem_to_ast_bo(gobj) container_of((gobj), struct ast_bo, gem)
diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index b8246227bab0..8008ea0bc76c 100644
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c
@@ -293,18 +293,22 @@ void ast_mm_fini(struct ast_private *ast)
 void ast_ttm_placement(struct ast_bo *bo, int domain)
 {
         u32 c = 0;
-        bo->placement.fpfn = 0;
-        bo->placement.lpfn = 0;
+        unsigned i;
+
         bo->placement.placement = bo->placements;
         bo->placement.busy_placement = bo->placements;
         if (domain & TTM_PL_FLAG_VRAM)
-                bo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
+                bo->placements[c++].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
         if (domain & TTM_PL_FLAG_SYSTEM)
-                bo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
+                bo->placements[c++].flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
         if (!c)
-                bo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
+                bo->placements[c++].flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
         bo->placement.num_placement = c;
         bo->placement.num_busy_placement = c;
+        for (i = 0; i < c; ++i) {
+                bo->placements[i].fpfn = 0;
+                bo->placements[i].lpfn = 0;
+        }
 }
 
 int ast_bo_create(struct drm_device *dev, int size, int align,
@@ -360,7 +364,7 @@ int ast_bo_pin(struct ast_bo *bo, u32 pl_flag, u64 *gpu_addr)
 
         ast_ttm_placement(bo, pl_flag);
         for (i = 0; i < bo->placement.num_placement; i++)
-                bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
+                bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret)
                 return ret;
@@ -383,7 +387,7 @@ int ast_bo_unpin(struct ast_bo *bo)
                 return 0;
 
         for (i = 0; i < bo->placement.num_placement ; i++)
-                bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT;
+                bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret)
                 return ret;
@@ -407,7 +411,7 @@ int ast_bo_push_sysram(struct ast_bo *bo)
 
         ast_ttm_placement(bo, TTM_PL_FLAG_SYSTEM);
         for (i = 0; i < bo->placement.num_placement ; i++)
-                bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
+                bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;
 
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret) {