Re: [PATCH v2 3/4] drm/amdgpu: Make amdgpu_vram_mgr_bo_invisible_size always accurate

2018-06-18 Thread Christian König 

Am 18.06.2018 um 18:52 schrieb Michel Dänzer:

From: Michel Dänzer 

Even BOs with AMDGPU_GEM_CREATE_NO_CPU_ACCESS may end up at least
partially in CPU visible VRAM, in particular when all VRAM is visible.

v2:
* Don't take VRAM mgr spinlock, not needed (Christian König)
* Make loop logic simpler and clearer.

Cc: sta...@vger.kernel.org
Signed-off-by: Michel Dänzer 


Reviewed-by: Christian König 


---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 20 ++--
  1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index ae0049c6c52c..b6333f92ba45 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -106,10 +106,26 @@ static u64 amdgpu_vram_mgr_vis_size(struct amdgpu_device 
*adev,
   */
  u64 amdgpu_vram_mgr_bo_invisible_size(struct amdgpu_bo *bo)
  {
-   if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)
+   struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
+   struct ttm_mem_reg *mem = &bo->tbo.mem;
+   struct drm_mm_node *nodes = mem->mm_node;
+   unsigned pages = mem->num_pages;
+   u64 usage = 0;
+
+   if (adev->gmc.visible_vram_size == adev->gmc.real_vram_size)
+   return 0;
+
+   if (mem->start >= adev->gmc.visible_vram_size >> PAGE_SHIFT)
return amdgpu_bo_size(bo);
  
-	return 0;

+   while (nodes && pages) {
+   usage += nodes->size << PAGE_SHIFT;
+   usage -= amdgpu_vram_mgr_vis_size(adev, nodes);
+   pages -= nodes->size;
+   ++nodes;
+   }
+
+   return usage;
  }
  
  /**


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

[PATCH v2 3/4] drm/amdgpu: Make amdgpu_vram_mgr_bo_invisible_size always accurate

2018-06-18 Thread Michel Dänzer 
From: Michel Dänzer 

Even BOs with AMDGPU_GEM_CREATE_NO_CPU_ACCESS may end up at least
partially in CPU visible VRAM, in particular when all VRAM is visible.

v2:
* Don't take VRAM mgr spinlock, not needed (Christian König)
* Make loop logic simpler and clearer.

Cc: sta...@vger.kernel.org
Signed-off-by: Michel Dänzer 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index ae0049c6c52c..b6333f92ba45 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -106,10 +106,26 @@ static u64 amdgpu_vram_mgr_vis_size(struct amdgpu_device 
*adev,
  */
 u64 amdgpu_vram_mgr_bo_invisible_size(struct amdgpu_bo *bo)
 {
-   if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)
+   struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
+   struct ttm_mem_reg *mem = &bo->tbo.mem;
+   struct drm_mm_node *nodes = mem->mm_node;
+   unsigned pages = mem->num_pages;
+   u64 usage = 0;
+
+   if (adev->gmc.visible_vram_size == adev->gmc.real_vram_size)
+   return 0;
+
+   if (mem->start >= adev->gmc.visible_vram_size >> PAGE_SHIFT)
return amdgpu_bo_size(bo);
 
-   return 0;
+   while (nodes && pages) {
+   usage += nodes->size << PAGE_SHIFT;
+   usage -= amdgpu_vram_mgr_vis_size(adev, nodes);
+   pages -= nodes->size;
+   ++nodes;
+   }
+
+   return usage;
 }
 
 /**
-- 
2.17.1

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