[PATCH 6/8] drm/amdgpu: use new cursor in amdgpu_mem_visible

2021-03-08 Thread Christian König 
Separate the drm_mm_node walking from the actual handling.

Signed-off-by: Christian König 
Acked-by: Oak Zeng 
Tested-by: Nirmoy Das 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 2cbe4ace591f..d469ba5fef2c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -441,7 +441,8 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
 static bool amdgpu_mem_visible(struct amdgpu_device *adev,
   struct ttm_resource *mem)
 {
-   struct drm_mm_node *nodes = mem->mm_node;
+   uint64_t mem_size = (u64)mem->num_pages << PAGE_SHIFT;
+   struct amdgpu_res_cursor cursor;
 
if (mem->mem_type == TTM_PL_SYSTEM ||
mem->mem_type == TTM_PL_TT)
@@ -449,12 +450,13 @@ static bool amdgpu_mem_visible(struct amdgpu_device *adev,
if (mem->mem_type != TTM_PL_VRAM)
return false;
 
+   amdgpu_res_first(mem, 0, mem_size, );
+
/* ttm_resource_ioremap only supports contiguous memory */
-   if (nodes->size != mem->num_pages)
+   if (cursor.size != mem_size)
return false;
 
-   return ((nodes->start + nodes->size) << PAGE_SHIFT)
-   <= adev->gmc.visible_vram_size;
+   return cursor.start + cursor.size <= adev->gmc.visible_vram_size;
 }
 
 /*
-- 
2.25.1

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 6/8] drm/amdgpu: use new cursor in amdgpu_mem_visible

2021-02-17 Thread Christian König 
Separate the drm_mm_node walking from the actual handling.

Signed-off-by: Christian König 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 204999d49fa8..8ec80a384be3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -560,7 +560,8 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object 
*bo, bool evict,
 static bool amdgpu_mem_visible(struct amdgpu_device *adev,
   struct ttm_resource *mem)
 {
-   struct drm_mm_node *nodes = mem->mm_node;
+   uint64_t mem_size = (u64)mem->num_pages << PAGE_SHIFT;
+   struct amdgpu_res_cursor cursor;
 
if (mem->mem_type == TTM_PL_SYSTEM ||
mem->mem_type == TTM_PL_TT)
@@ -568,12 +569,13 @@ static bool amdgpu_mem_visible(struct amdgpu_device *adev,
if (mem->mem_type != TTM_PL_VRAM)
return false;
 
+   amdgpu_res_first(mem, 0, mem_size, );
+
/* ttm_resource_ioremap only supports contiguous memory */
-   if (nodes->size != mem->num_pages)
+   if (cursor.size != mem_size)
return false;
 
-   return ((nodes->start + nodes->size) << PAGE_SHIFT)
-   <= adev->gmc.visible_vram_size;
+   return cursor.start + cursor.size <= adev->gmc.visible_vram_size;
 }
 
 /*
-- 
2.25.1

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx