Re: [PATCH 1/6] drm/ttm: cleanup and optimize ttm_bo_mem_compat v2

Ping! Any more comments on that set or can I push it?

Thanks, Christian.

Am 31.03.2017 um 11:47 schrieb Christian König:

From: Christian König christian.koenig@amd.com

No need to implement the same logic twice. Also check if the busy placements are identical to the already scanned placements before checking them.

v2: improve check even more as suggested by Michel.

Signed-off-by: Christian König christian.koenig@amd.com

drivers/gpu/drm/ttm/ttm_bo.c | 45 ++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 989b98b..348b17e 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1046,29 +1046,17 @@ static int ttm_bo_move_buffer(struct ttm_buffer_object *bo, return ret; }

-bool ttm_bo_mem_compat(struct ttm_placement *placement,

•        struct ttm_mem_reg *mem,
  

•        uint32_t *new_flags)
  

+static bool ttm_bo_places_compat(const struct ttm_place *places,

• 		 unsigned num_placement,
  

• 		 struct ttm_mem_reg *mem,
  

• 		 uint32_t *new_flags)
  

  {

• int i;

• unsigned i;

• for (i = 0; i < placement->num_placement; i++) {

• const struct ttm_place *heap = &placement->placement[i];
  

• if (mem->mm_node &&
  

•     (mem->start < heap->fpfn ||
  

•      (heap->lpfn != 0 && (mem->start + mem->num_pages) > heap->lpfn)))
  

• 	continue;
  

• for (i = 0; i < num_placement; i++) {

• const struct ttm_place *heap = &places[i];
  
  

• *new_flags = heap->flags;
  

• if ((*new_flags & mem->placement & TTM_PL_MASK_CACHING) &&
  

•     (*new_flags & mem->placement & TTM_PL_MASK_MEM))
  

• 	return true;
  

• }
• for (i = 0; i < placement->num_busy_placement; i++) {

• const struct ttm_place *heap = &placement->busy_placement[i];
  

• if (mem->mm_node &&
  

•     (mem->start < heap->fpfn ||
  

• if (mem->mm_node && (mem->start < heap->fpfn ||
  (heap->lpfn != 0 && (mem->start + mem->num_pages) > heap->lpfn)))
  continue;
  
  

@@ -1077,6 +1065,23 @@ bool ttm_bo_mem_compat(struct ttm_placement *placement, (*new_flags & mem->placement & TTM_PL_MASK_MEM)) return true; }

• return false;

+}

+bool ttm_bo_mem_compat(struct ttm_placement *placement,

•        struct ttm_mem_reg *mem,
  

•        uint32_t *new_flags)
  

+{

• if (ttm_bo_places_compat(placement->placement, placement->num_placement,

• 		 mem, new_flags))
  

• return true;
  

• if ((placement->busy_placement != placement->placement ||

•     placement->num_busy_placement > placement->num_placement) &&
  

•    ttm_bo_places_compat(placement->busy_placement,
  

• 		 placement->num_busy_placement,
  

• 		 mem, new_flags))
  

• return true;
  
  

  return false; }