Skip to contentSkip to conversation

drm/amdgpu: minor cleanup for amdgpu_ttm_bind

PATCH In review Christian König 4 participants 12 messages Oct 20, 2017 – Oct 24, 2017 7 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/5 drm/amdgpu: minor cleanup for amdgpu_ttm_bind

From: Christian König <[email protected]>

Filter the placement mask before using it. In theory it could be that we have other flags set here as well.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -1
index dcdfb8d176fc..32c822f3db11 100644
@@ -910,7 +910,8 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
 	placement.busy_placement = &placements;
 	placements.fpfn = 0;
 	placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT;
-	placements.flags = bo->mem.placement | TTM_PL_FLAG_TT;
+	placements.flags = (bo->mem.placement & ~TTM_PL_MASK_MEM) |
+		TTM_PL_FLAG_TT;
 
 	r = ttm_bo_mem_space(bo, &placement, &tmp, true, false);
 	if (unlikely(r))
Signature · 6 lines
2.11.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20171020092036.11145-1-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

#2 lore raw

PATCH 2/5 drm/amdgpu: nuke amdgpu_ttm_is_bound()

From: Christian König <[email protected]>

use amdgpu_gtt_mgr_is_allocated() instead.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    | 15 +++++----------
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h    |  1 -
 4 files changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
index 8b4ed8a98a18..71a0c1a477ae 100644
@@ -980,7 +980,7 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
 {
 	WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);
 	WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_TT &&
-		     !amdgpu_ttm_is_bound(bo->tbo.ttm));
+		     !amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem));
 	WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) &&
 		     !bo->pin_count);
 	WARN_ON_ONCE(bo->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET);
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -1
index 428aae048f4b..3affcc497be6 100644
@@ -187,7 +187,7 @@ static inline u64 amdgpu_bo_mmap_offset(struct amdgpu_bo *bo)
 static inline bool amdgpu_bo_gpu_accessible(struct amdgpu_bo *bo)
 {
 	switch (bo->tbo.mem.mem_type) {
-	case TTM_PL_TT: return amdgpu_ttm_is_bound(bo->tbo.ttm);
+	case TTM_PL_TT: return amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem);
 	case TTM_PL_VRAM: return true;
 	default: return false;
 	}
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +5 -10
index 32c822f3db11..1c9faa1a53ce 100644
@@ -861,8 +861,10 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm,
 	    bo_mem->mem_type == AMDGPU_PL_OA)
 		return -EINVAL;
 
-	if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
+	if (!amdgpu_gtt_mgr_is_allocated(bo_mem)) {
+		gtt->offset = AMDGPU_BO_INVALID_OFFSET;
 		return 0;
+	}
 
 	spin_lock(&gtt->adev->gtt_list_lock);
 	flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, bo_mem);
@@ -882,13 +884,6 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm,
 	return r;
 }
 
-bool amdgpu_ttm_is_bound(struct ttm_tt *ttm)
-{
-	struct amdgpu_ttm_tt *gtt = (void *)ttm;
-
-	return gtt && !list_empty(&gtt->list);
-}
-
 int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
 {
 	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);
@@ -899,7 +894,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
 	struct ttm_place placements;
 	int r;
 
-	if (!ttm || amdgpu_ttm_is_bound(ttm))
+	if (!ttm || amdgpu_gtt_mgr_is_allocated(bo_mem))
 		return 0;
 
 	tmp = bo->mem;
@@ -960,7 +955,7 @@ static int amdgpu_ttm_backend_unbind(struct ttm_tt *ttm)
 	if (gtt->userptr)
 		amdgpu_ttm_tt_unpin_userptr(ttm);
 
-	if (!amdgpu_ttm_is_bound(ttm))
+	if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)
 		return 0;
 
 	/* unbind shouldn't be done for GDS/GWS/OA in ttm_bo_clean_mm */
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +0 -1
index abd4084982a3..89a71abc71e0 100644
@@ -90,7 +90,6 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
 			struct dma_fence **fence);
 
 int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);
-bool amdgpu_ttm_is_bound(struct ttm_tt *ttm);
 int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem);
 int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);
 
Signature · 6 lines
2.11.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20171020092036.11145-2-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

#4 lore raw

Re: [PATCH 2/5] drm/amdgpu: nuke amdgpu_ttm_is_bound()

using ttm->state == tt_bound seems make more sense.

Quoted 91 lines · Christian König

From: Christian König <[email protected]>

use amdgpu_gtt_mgr_is_allocated() instead.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |  2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    | 15 +++++----------
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h    |  1 -
  4 files changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
index 8b4ed8a98a18..71a0c1a477ae 100644
@@ -980,7 +980,7 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
  {
  	WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);
  	WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_TT &&
-		     !amdgpu_ttm_is_bound(bo->tbo.ttm));
+		     !amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem));
  	WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) &&
  		     !bo->pin_count);
  	WARN_ON_ONCE(bo->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET);
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -1
index 428aae048f4b..3affcc497be6 100644
@@ -187,7 +187,7 @@ static inline u64 amdgpu_bo_mmap_offset(struct amdgpu_bo *bo)
  static inline bool amdgpu_bo_gpu_accessible(struct amdgpu_bo *bo)
  {
  	switch (bo->tbo.mem.mem_type) {
-	case TTM_PL_TT: return amdgpu_ttm_is_bound(bo->tbo.ttm);
+	case TTM_PL_TT: return amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem);
  	case TTM_PL_VRAM: return true;
  	default: return false;
  	}
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +5 -10
index 32c822f3db11..1c9faa1a53ce 100644
@@ -861,8 +861,10 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm,
  	    bo_mem->mem_type == AMDGPU_PL_OA)
  		return -EINVAL;
 
-	if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
+	if (!amdgpu_gtt_mgr_is_allocated(bo_mem)) {
+		gtt->offset = AMDGPU_BO_INVALID_OFFSET;
  		return 0;
+	}
 
  	spin_lock(&gtt->adev->gtt_list_lock);
  	flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, bo_mem);
@@ -882,13 +884,6 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm,
  	return r;
  }
 
-bool amdgpu_ttm_is_bound(struct ttm_tt *ttm)
-{
-	struct amdgpu_ttm_tt *gtt = (void *)ttm;
-
-	return gtt && !list_empty(&gtt->list);
-}
-
  int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
  {
  	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);
@@ -899,7 +894,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
  	struct ttm_place placements;
  	int r;
 
-	if (!ttm || amdgpu_ttm_is_bound(ttm))
+	if (!ttm || amdgpu_gtt_mgr_is_allocated(bo_mem))
  		return 0;
 
  	tmp = bo->mem;
@@ -960,7 +955,7 @@ static int amdgpu_ttm_backend_unbind(struct ttm_tt *ttm)
  	if (gtt->userptr)
  		amdgpu_ttm_tt_unpin_userptr(ttm);
 
-	if (!amdgpu_ttm_is_bound(ttm))
+	if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)
  		return 0;
 
  	/* unbind shouldn't be done for GDS/GWS/OA in ttm_bo_clean_mm */
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +0 -0
index abd4084982a3..89a71abc71e0 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h int amdgpu_fill_buffer(struct amdgpu_bo *bo, · line 95

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +0 -1
@@ -90,7 +90,6 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
  			struct dma_fence **fence);
 
  int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);
-bool amdgpu_ttm_is_bound(struct ttm_tt *ttm);
  int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem);
  int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);
 

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 0f8c52bb-fefa-319a-2926-e30a403d0867-5C7GfCeVMHo@public.gmane.org

#6 lore raw

Re: [PATCH 2/5] drm/amdgpu: nuke amdgpu_ttm_is_bound()

Am 23.10.2017 um 09:33 schrieb Chunming Zhou:

Quoted 1 line

using ttm->state == tt_bound seems make more sense.

That won't work. We set ttm->state = tt_bound even when we haven't allocated GART space.

That's also a reason why I wanted to remove it, the name is confusing.

Christian.

Quoted 89 lines · Christian König
Quoted 86 lines

From: Christian König <[email protected]>

use amdgpu_gtt_mgr_is_allocated() instead.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |  2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    | 15 +++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h    |  1 -

  4 files changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0 -0
index 8b4ed8a98a18..71a0c1a477ae 100644
@@ -980,7 +980,7 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
   {
       WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);

      WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_TT && -             !amdgpu_ttm_is_bound(bo->tbo.ttm));
+ !amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem)); WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) && !bo->pin_count); WARN_ON_ONCE(bo->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET);

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -1
index 428aae048f4b..3affcc497be6 100644
@@ -187,7 +187,7 @@ static inline u64 amdgpu_bo_mmap_offset(struct 
 amdgpu_bo *bo)
   static inline bool amdgpu_bo_gpu_accessible(struct amdgpu_bo *bo)
   {
       switch (bo->tbo.mem.mem_type) {
-    case TTM_PL_TT: return amdgpu_ttm_is_bound(bo->tbo.ttm);
+    case TTM_PL_TT: return amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem);
       case TTM_PL_VRAM: return true;
       default: return false;

      }

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -6
index 32c822f3db11..1c9faa1a53ce 100644
@@ -861,8 +861,10 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt 
 *ttm,
           bo_mem->mem_type == AMDGPU_PL_OA)
           return -EINVAL;
   -    if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
+    if (!amdgpu_gtt_mgr_is_allocated(bo_mem)) {
+        gtt->offset = AMDGPU_BO_INVALID_OFFSET;
           return 0;
+    }
         spin_lock(&gtt->adev->gtt_list_lock);
       flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, bo_mem);
@@ -882,13 +884,6 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt 
 *ttm,
       return r;
   }
   -bool amdgpu_ttm_is_bound(struct ttm_tt *ttm)
-{
-    struct amdgpu_ttm_tt *gtt = (void *)ttm;
-
-    return gtt && !list_empty(&gtt->list);
-}
-
   int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
   {

      struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -0
@@ -899,7 +894,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, 
 struct ttm_mem_reg *bo_mem)
       struct ttm_place placements;
       int r;
   -    if (!ttm || amdgpu_ttm_is_bound(ttm))
+    if (!ttm || amdgpu_gtt_mgr_is_allocated(bo_mem))
           return 0;
         tmp = bo->mem;
@@ -960,7 +955,7 @@ static int amdgpu_ttm_backend_unbind(struct 
 ttm_tt *ttm)
       if (gtt->userptr)
           amdgpu_ttm_tt_unpin_userptr(ttm);
   -    if (!amdgpu_ttm_is_bound(ttm))
+    if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)
           return 0;
         /* unbind shouldn't be done for GDS/GWS/OA in ttm_bo_clean_mm */
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +0 -0
index abd4084982a3..89a71abc71e0 100644
Quoted 9 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h int amdgpu_fill_buffer(struct amdgpu_bo *bo, · line 93

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +0 -1
@@ -90,7 +90,6 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
               struct dma_fence **fence);
     int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);
-bool amdgpu_ttm_is_bound(struct ttm_tt *ttm);
   int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem);
   int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 09bdc92d-f3bd-6b07-85fc-8943220248cc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#8 lore raw

Re: [PATCH 2/5] drm/amdgpu: nuke amdgpu_ttm_is_bound()

Yes, I see the checking in backend_bind:

        if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
                return 0;

OK, then my only concern is your ’instead‘ assumes amdgpu_gtt_mgr_is_allocated means gart is bound, how about:

bool amdgpu_gtt_is_bound(struct ttm_tt *ttm)
{
    return amdgpu_gtt_mgr_is_allocated(bo_mem);
}

Why I prefer to keep is_bound for naming is we only can get gpu offset after gtt is bound not check if node is allocated.

Regards,
David Zhou

Quoted 108 lines · Christian König

Am 23.10.2017 um 09:33 schrieb Chunming Zhou:

Quoted 1 line

using ttm->state == tt_bound seems make more sense.

That won't work. We set ttm->state = tt_bound even when we haven't allocated GART space.

That's also a reason why I wanted to remove it, the name is confusing.

Christian.

Quoted 98 lines · Christian König
Quoted 94 lines

From: Christian König <[email protected]>

use amdgpu_gtt_mgr_is_allocated() instead.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |  2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    | 15 +++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h    |  1 -

  4 files changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0 -0
index 8b4ed8a98a18..71a0c1a477ae 100644
@@ -980,7 +980,7 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
   {
       WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);

      WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_TT && -             !amdgpu_ttm_is_bound(bo->tbo.ttm));
+ !amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem)); WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) && !bo->pin_count); WARN_ON_ONCE(bo->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET);

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -1
index 428aae048f4b..3affcc497be6 100644
@@ -187,7 +187,7 @@ static inline u64 amdgpu_bo_mmap_offset(struct 
 amdgpu_bo *bo)
   static inline bool amdgpu_bo_gpu_accessible(struct amdgpu_bo *bo)
   {
       switch (bo->tbo.mem.mem_type) {
-    case TTM_PL_TT: return amdgpu_ttm_is_bound(bo->tbo.ttm);
+    case TTM_PL_TT: return amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem);
       case TTM_PL_VRAM: return true;
       default: return false;

      }

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -6
index 32c822f3db11..1c9faa1a53ce 100644
@@ -861,8 +861,10 @@ static int amdgpu_ttm_backend_bind(struct 
 ttm_tt *ttm,
           bo_mem->mem_type == AMDGPU_PL_OA)
           return -EINVAL;
   -    if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
+    if (!amdgpu_gtt_mgr_is_allocated(bo_mem)) {
+        gtt->offset = AMDGPU_BO_INVALID_OFFSET;
           return 0;
+    }
         spin_lock(&gtt->adev->gtt_list_lock);
       flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, bo_mem);
@@ -882,13 +884,6 @@ static int amdgpu_ttm_backend_bind(struct 
 ttm_tt *ttm,
       return r;
   }
   -bool amdgpu_ttm_is_bound(struct ttm_tt *ttm)
-{
-    struct amdgpu_ttm_tt *gtt = (void *)ttm;
-
-    return gtt && !list_empty(&gtt->list);
-}
-
   int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
   {

      struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -0
@@ -899,7 +894,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object 
 *bo, struct ttm_mem_reg *bo_mem)
       struct ttm_place placements;
       int r;
   -    if (!ttm || amdgpu_ttm_is_bound(ttm))
+    if (!ttm || amdgpu_gtt_mgr_is_allocated(bo_mem))
           return 0;
         tmp = bo->mem;
@@ -960,7 +955,7 @@ static int amdgpu_ttm_backend_unbind(struct 
 ttm_tt *ttm)
       if (gtt->userptr)
           amdgpu_ttm_tt_unpin_userptr(ttm);
   -    if (!amdgpu_ttm_is_bound(ttm))
+    if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)
           return 0;
         /* unbind shouldn't be done for GDS/GWS/OA in ttm_bo_clean_mm */
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +0 -1
index abd4084982a3..89a71abc71e0 100644
@@ -90,7 +90,6 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
               struct dma_fence **fence);
     int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);
-bool amdgpu_ttm_is_bound(struct ttm_tt *ttm);
   int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem);
   int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): d404cdc7-9b5a-297f-1d21-25bb1b037ac1-5C7GfCeVMHo@public.gmane.org

#10 lore raw

Re: [PATCH 2/5] drm/amdgpu: nuke amdgpu_ttm_is_bound()

Quoted 1 line

Why I prefer to keep is_bound for naming is we only can get gpu offset after gtt is bound not check if node is allocated.

No, it is just the other way around.

When the TTM is bound it doesn't mean we can get the GPU offset because it can be that there wasn't any GART space assigned.

But if the GART space was allocated, we can be sure that we also have an GPU offset to use.

Regards,
Christian.

Am 23.10.2017 um 10:34 schrieb Chunming Zhou:

Quoted 126 lines

Yes, I see the checking in backend_bind:

        if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
                return 0;

OK, then my only concern is your ’instead‘ assumes amdgpu_gtt_mgr_is_allocated means gart is bound, how about:

bool amdgpu_gtt_is_bound(struct ttm_tt *ttm)
{
    return amdgpu_gtt_mgr_is_allocated(bo_mem);
}

Why I prefer to keep is_bound for naming is we only can get gpu offset after gtt is bound not check if node is allocated.

Regards,
David Zhou

Quoted 108 lines · Christian König

Am 23.10.2017 um 09:33 schrieb Chunming Zhou:

Quoted 1 line

using ttm->state == tt_bound seems make more sense.

That won't work. We set ttm->state = tt_bound even when we haven't allocated GART space.

That's also a reason why I wanted to remove it, the name is confusing.

Christian.

Quoted 98 lines · Christian König
Quoted 94 lines

From: Christian König <[email protected]>

use amdgpu_gtt_mgr_is_allocated() instead.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |  2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    | 15 +++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h    |  1 -

  4 files changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0 -0
index 8b4ed8a98a18..71a0c1a477ae 100644
@@ -980,7 +980,7 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
   {
       WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);

      WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_TT && -             !amdgpu_ttm_is_bound(bo->tbo.ttm));
+ !amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem)); WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) && !bo->pin_count); WARN_ON_ONCE(bo->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET);

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -1
index 428aae048f4b..3affcc497be6 100644
@@ -187,7 +187,7 @@ static inline u64 amdgpu_bo_mmap_offset(struct 
 amdgpu_bo *bo)
   static inline bool amdgpu_bo_gpu_accessible(struct amdgpu_bo *bo)
   {
       switch (bo->tbo.mem.mem_type) {
-    case TTM_PL_TT: return amdgpu_ttm_is_bound(bo->tbo.ttm);
+    case TTM_PL_TT: return amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem);
       case TTM_PL_VRAM: return true;
       default: return false;

      }

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -6
index 32c822f3db11..1c9faa1a53ce 100644
@@ -861,8 +861,10 @@ static int amdgpu_ttm_backend_bind(struct 
 ttm_tt *ttm,
           bo_mem->mem_type == AMDGPU_PL_OA)
           return -EINVAL;
   -    if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
+    if (!amdgpu_gtt_mgr_is_allocated(bo_mem)) {
+        gtt->offset = AMDGPU_BO_INVALID_OFFSET;
           return 0;
+    }
         spin_lock(&gtt->adev->gtt_list_lock);
       flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, bo_mem);
@@ -882,13 +884,6 @@ static int amdgpu_ttm_backend_bind(struct 
 ttm_tt *ttm,
       return r;
   }
   -bool amdgpu_ttm_is_bound(struct ttm_tt *ttm)
-{
-    struct amdgpu_ttm_tt *gtt = (void *)ttm;
-
-    return gtt && !list_empty(&gtt->list);
-}
-
   int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
   {

      struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -0
@@ -899,7 +894,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object 
 *bo, struct ttm_mem_reg *bo_mem)
       struct ttm_place placements;
       int r;
   -    if (!ttm || amdgpu_ttm_is_bound(ttm))
+    if (!ttm || amdgpu_gtt_mgr_is_allocated(bo_mem))
           return 0;
         tmp = bo->mem;
@@ -960,7 +955,7 @@ static int amdgpu_ttm_backend_unbind(struct 
 ttm_tt *ttm)
       if (gtt->userptr)
           amdgpu_ttm_tt_unpin_userptr(ttm);
   -    if (!amdgpu_ttm_is_bound(ttm))
+    if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)
           return 0;
         /* unbind shouldn't be done for GDS/GWS/OA in ttm_bo_clean_mm */
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +0 -1
index abd4084982a3..89a71abc71e0 100644
@@ -90,7 +90,6 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
               struct dma_fence **fence);
     int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);
-bool amdgpu_ttm_is_bound(struct ttm_tt *ttm);
   int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem);
   int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);
Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): f763be73-ed30-e278-d951-3ff2d88735c5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#12 lore raw

Re: [PATCH 2/5] drm/amdgpu: nuke amdgpu_ttm_is_bound()

Quoted 4 lines · Christian König
Quoted 1 line

Why I prefer to keep is_bound for naming is we only can get gpu offset after gtt is bound not check if node is allocated.

No, it is just the other way around.

When the TTM is bound it doesn't mean we can get the GPU offset because it can be that there wasn't any GART space assigned.

Sorry, I didn't say clear, I'm not saying TTM bound but GART bound, we only can get GPU offset after calling amdgpu_gart_bind() not node allocated, so I thought amdgpu_gtt_is_bound is more sense than old amdgpu_ttm_is_bound.

Quoted 2 lines

But if the GART space was allocated, we can be sure that we also have an GPU offset to use.

I know it, in current all use case, we always do gart_bind when GART node is allocated, so I'd like use amdgpu_gtt_is_bound() to wrap amdgpu_gtt_mgr_is_allocated().

Regards,
David Zhou

Quoted 138 lines

Regards,
Christian.

Am 23.10.2017 um 10:34 schrieb Chunming Zhou:

Quoted 131 lines

Yes, I see the checking in backend_bind:

        if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
                return 0;

OK, then my only concern is your ’instead‘ assumes amdgpu_gtt_mgr_is_allocated means gart is bound, how about:

bool amdgpu_gtt_is_bound(struct ttm_tt *ttm)
{
    return amdgpu_gtt_mgr_is_allocated(bo_mem);
}

Why I prefer to keep is_bound for naming is we only can get gpu offset after gtt is bound not check if node is allocated.

Regards,
David Zhou

Quoted 109 lines · Christian König

Am 23.10.2017 um 09:33 schrieb Chunming Zhou:

Quoted 1 line

using ttm->state == tt_bound seems make more sense.

That won't work. We set ttm->state = tt_bound even when we haven't allocated GART space.

That's also a reason why I wanted to remove it, the name is confusing.

Christian.

Quoted 99 lines · Christian König
Quoted 95 lines

From: Christian König <[email protected]>

use amdgpu_gtt_mgr_is_allocated() instead.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |  2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    | 15 +++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h    |  1 -

  4 files changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0 -0
index 8b4ed8a98a18..71a0c1a477ae 100644
@@ -980,7 +980,7 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
   {
       WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);

      WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_TT && -             !amdgpu_ttm_is_bound(bo->tbo.ttm));
+ !amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem)); WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) && !bo->pin_count); WARN_ON_ONCE(bo->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET);

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -1
index 428aae048f4b..3affcc497be6 100644
@@ -187,7 +187,7 @@ static inline u64 amdgpu_bo_mmap_offset(struct 
 amdgpu_bo *bo)
   static inline bool amdgpu_bo_gpu_accessible(struct amdgpu_bo *bo)
   {
       switch (bo->tbo.mem.mem_type) {
-    case TTM_PL_TT: return amdgpu_ttm_is_bound(bo->tbo.ttm);
+    case TTM_PL_TT: return 
 amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem);
       case TTM_PL_VRAM: return true;

      default: return false;
      }

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -6
index 32c822f3db11..1c9faa1a53ce 100644
@@ -861,8 +861,10 @@ static int amdgpu_ttm_backend_bind(struct 
 ttm_tt *ttm,
           bo_mem->mem_type == AMDGPU_PL_OA)
           return -EINVAL;
   -    if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
+    if (!amdgpu_gtt_mgr_is_allocated(bo_mem)) {
+        gtt->offset = AMDGPU_BO_INVALID_OFFSET;
           return 0;
+    }
         spin_lock(&gtt->adev->gtt_list_lock);
       flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, bo_mem);
@@ -882,13 +884,6 @@ static int amdgpu_ttm_backend_bind(struct 
 ttm_tt *ttm,
       return r;
   }
   -bool amdgpu_ttm_is_bound(struct ttm_tt *ttm)
-{
-    struct amdgpu_ttm_tt *gtt = (void *)ttm;
-
-    return gtt && !list_empty(&gtt->list);
-}
-
   int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
   {

      struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -0
@@ -899,7 +894,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object 
 *bo, struct ttm_mem_reg *bo_mem)
       struct ttm_place placements;
       int r;
   -    if (!ttm || amdgpu_ttm_is_bound(ttm))
+    if (!ttm || amdgpu_gtt_mgr_is_allocated(bo_mem))
           return 0;
         tmp = bo->mem;
@@ -960,7 +955,7 @@ static int amdgpu_ttm_backend_unbind(struct 
 ttm_tt *ttm)
       if (gtt->userptr)
           amdgpu_ttm_tt_unpin_userptr(ttm);
   -    if (!amdgpu_ttm_is_bound(ttm))
+    if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)
           return 0;
         /* unbind shouldn't be done for GDS/GWS/OA in ttm_bo_clean_mm */
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +0 -1
index abd4084982a3..89a71abc71e0 100644
@@ -90,7 +90,6 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
               struct dma_fence **fence);
     int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);
-bool amdgpu_ttm_is_bound(struct ttm_tt *ttm);
   int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem);
   int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 8203a931-2c05-cd50-2788-ab10e70382de-5C7GfCeVMHo@public.gmane.org

#14 lore raw

Re: [PATCH 2/5] drm/amdgpu: nuke amdgpu_ttm_is_bound()

Am 24.10.2017 um 03:41 schrieb Chunming Zhou:

Quoted 8 lines · Christian König
Quoted 4 lines
Quoted 1 line

Why I prefer to keep is_bound for naming is we only can get gpu offset after gtt is bound not check if node is allocated.

No, it is just the other way around.

When the TTM is bound it doesn't mean we can get the GPU offset because it can be that there wasn't any GART space assigned.

Sorry, I didn't say clear, I'm not saying TTM bound but GART bound, we only can get GPU offset after calling amdgpu_gart_bind() not node allocated, so I thought amdgpu_gtt_is_bound is more sense than old amdgpu_ttm_is_bound.

And exactly that is incorrect. You can get the offset as soon as the GART space is allocated. We don't have to call amdgpu_gart_bind() for that.

The GART binding is needed for the stuff to work in the end, but it can in theory can come later on.

Quoted 3 lines
Quoted 2 lines

But if the GART space was allocated, we can be sure that we also have an GPU offset to use.

I know it, in current all use case, we always do gart_bind when GART node is allocated, so I'd like use amdgpu_gtt_is_bound() to wrap amdgpu_gtt_mgr_is_allocated().

Yeah, I think I can live with that as well.

Regards,
Christian.

Quoted 142 lines

Regards,
David Zhou

Quoted 138 lines

Regards,
Christian.

Am 23.10.2017 um 10:34 schrieb Chunming Zhou:

Quoted 131 lines

Yes, I see the checking in backend_bind:

        if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
                return 0;

OK, then my only concern is your ’instead‘ assumes amdgpu_gtt_mgr_is_allocated means gart is bound, how about:

bool amdgpu_gtt_is_bound(struct ttm_tt *ttm)
{
    return amdgpu_gtt_mgr_is_allocated(bo_mem);
}

Why I prefer to keep is_bound for naming is we only can get gpu offset after gtt is bound not check if node is allocated.

Regards,
David Zhou

Quoted 109 lines · Christian König

Am 23.10.2017 um 09:33 schrieb Chunming Zhou:

Quoted 1 line

using ttm->state == tt_bound seems make more sense.

That won't work. We set ttm->state = tt_bound even when we haven't allocated GART space.

That's also a reason why I wanted to remove it, the name is confusing.

Christian.

Quoted 99 lines · Christian König
Quoted 95 lines

From: Christian König <[email protected]>

use amdgpu_gtt_mgr_is_allocated() instead.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c |  2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h |  2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    | 15 +++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h    |  1 -

  4 files changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0 -0
index 8b4ed8a98a18..71a0c1a477ae 100644
@@ -980,7 +980,7 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)
   {
       WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);

      WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_TT && -             !amdgpu_ttm_is_bound(bo->tbo.ttm));
+ !amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem)); WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) && !bo->pin_count); WARN_ON_ONCE(bo->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET);

drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -1
index 428aae048f4b..3affcc497be6 100644
@@ -187,7 +187,7 @@ static inline u64 
 amdgpu_bo_mmap_offset(struct amdgpu_bo *bo)
   static inline bool amdgpu_bo_gpu_accessible(struct amdgpu_bo *bo)
   {
       switch (bo->tbo.mem.mem_type) {
-    case TTM_PL_TT: return amdgpu_ttm_is_bound(bo->tbo.ttm);
+    case TTM_PL_TT: return 
 amdgpu_gtt_mgr_is_allocated(&bo->tbo.mem);
       case TTM_PL_VRAM: return true;

      default: return false;
      }

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -6
index 32c822f3db11..1c9faa1a53ce 100644
@@ -861,8 +861,10 @@ static int amdgpu_ttm_backend_bind(struct 
 ttm_tt *ttm,
           bo_mem->mem_type == AMDGPU_PL_OA)
           return -EINVAL;
   -    if (!amdgpu_gtt_mgr_is_allocated(bo_mem))
+    if (!amdgpu_gtt_mgr_is_allocated(bo_mem)) {
+        gtt->offset = AMDGPU_BO_INVALID_OFFSET;
           return 0;
+    }
         spin_lock(&gtt->adev->gtt_list_lock);
       flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, bo_mem);
@@ -882,13 +884,6 @@ static int amdgpu_ttm_backend_bind(struct 
 ttm_tt *ttm,
       return r;
   }
   -bool amdgpu_ttm_is_bound(struct ttm_tt *ttm)
-{
-    struct amdgpu_ttm_tt *gtt = (void *)ttm;
-
-    return gtt && !list_empty(&gtt->list);
-}
-
   int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
   {

      struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -0
@@ -899,7 +894,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object 
 *bo, struct ttm_mem_reg *bo_mem)
       struct ttm_place placements;
       int r;
   -    if (!ttm || amdgpu_ttm_is_bound(ttm))
+    if (!ttm || amdgpu_gtt_mgr_is_allocated(bo_mem))
           return 0;
         tmp = bo->mem;
@@ -960,7 +955,7 @@ static int amdgpu_ttm_backend_unbind(struct 
 ttm_tt *ttm)
       if (gtt->userptr)
           amdgpu_ttm_tt_unpin_userptr(ttm);
   -    if (!amdgpu_ttm_is_bound(ttm))
+    if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)
           return 0;
         /* unbind shouldn't be done for GDS/GWS/OA in ttm_bo_clean_mm */
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +0 -1
index abd4084982a3..89a71abc71e0 100644
@@ -90,7 +90,6 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
               struct dma_fence **fence);
     int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);
-bool amdgpu_ttm_is_bound(struct ttm_tt *ttm);
   int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem);
   int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#15 lore raw

PATCH 3/5 drm/amdgpu: remove extra parameter from amdgpu_ttm_bind()

In reply to a message not in the archive

From: Christian König <[email protected]>

We always use the BO mem now.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c     | 4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    | 6 +++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2 -2
index f7fceb63413c..9f0a462bf70f 100644
@@ -675,7 +675,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
 	if (!r && p->uf_entry.robj) {
 		struct amdgpu_bo *uf = p->uf_entry.robj;
 
-		r = amdgpu_ttm_bind(&uf->tbo, &uf->tbo.mem);
+		r = amdgpu_ttm_bind(&uf->tbo);
 		p->job->uf_addr += amdgpu_bo_gpu_offset(uf);
 	}
 
@@ -1591,5 +1591,5 @@ int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
 			return r;
 	}
 
-	return amdgpu_ttm_bind(&(*bo)->tbo, &(*bo)->tbo.mem);
+	return amdgpu_ttm_bind(&(*bo)->tbo);
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
index 71a0c1a477ae..aecc62b158d9 100644
@@ -690,7 +690,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
 
 	bo->pin_count = 1;
 	if (gpu_addr != NULL) {
-		r = amdgpu_ttm_bind(&bo->tbo, &bo->tbo.mem);
+		r = amdgpu_ttm_bind(&bo->tbo);
 		if (unlikely(r)) {
 			dev_err(adev->dev, "%p bind failed\n", bo);
 			goto error;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -3
index 1c9faa1a53ce..a0944a150d9a 100644
@@ -884,7 +884,7 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm,
 	return r;
 }
 
-int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
+int amdgpu_ttm_bind(struct ttm_buffer_object *bo)
 {
 	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);
 	struct ttm_tt *ttm = bo->ttm;
@@ -894,7 +894,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
 	struct ttm_place placements;
 	int r;
 
-	if (!ttm || amdgpu_gtt_mgr_is_allocated(bo_mem))
+	if (!ttm || amdgpu_gtt_mgr_is_allocated(&bo->mem))
 		return 0;
 
 	tmp = bo->mem;
@@ -1627,7 +1627,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
 	}
 
 	if (bo->tbo.mem.mem_type == TTM_PL_TT) {
-		r = amdgpu_ttm_bind(&bo->tbo, &bo->tbo.mem);
+		r = amdgpu_ttm_bind(&bo->tbo);
 		if (r)
 			return r;
 	}
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +1 -1
index 89a71abc71e0..39140ed88273 100644
@@ -90,7 +90,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
 			struct dma_fence **fence);
 
 int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);
-int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem);
+int amdgpu_ttm_bind(struct ttm_buffer_object *bo);
 int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);
 
 int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages);
Signature · 6 lines
2.11.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#16 lore raw

PATCH 4/5 drm/amdgpu: move GART recovery into GTT manager

In reply to a message not in the archive

From: Christian König <[email protected]>

The GTT manager handles the GART address space anyway, so it is completely pointless to keep the same information around twice.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h         |  3 --
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c  |  8 ++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 53 +++++++++++++++++++++--------
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c     | 51 ++++++++-------------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h     |  3 +-
 5 files changed, 59 insertions(+), 59 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -3
index 774edc1a3118..bf34076eedca 100644
@@ -1631,9 +1631,6 @@ struct amdgpu_device {
 	/* link all shadow bo */
 	struct list_head                shadow_list;
 	struct mutex                    shadow_list_lock;
-	/* link all gtt */
-	spinlock_t			gtt_list_lock;
-	struct list_head                gtt_list;
 	/* keep an lru list of rings by HW IP */
 	struct list_head		ring_lru_list;
 	spinlock_t			ring_lru_list_lock;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -5
index 99acf2978134..4f99d17aa582 100644
@@ -2177,9 +2177,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
 	INIT_LIST_HEAD(&adev->shadow_list);
 	mutex_init(&adev->shadow_list_lock);
 
-	INIT_LIST_HEAD(&adev->gtt_list);
-	spin_lock_init(&adev->gtt_list_lock);
-
 	INIT_LIST_HEAD(&adev->ring_lru_list);
 	spin_lock_init(&adev->ring_lru_list_lock);
 
@@ -2885,7 +2882,7 @@ int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, struct amdgpu_job *job)
 	amdgpu_sriov_reinit_early(adev);
 
 	/* we need recover gart prior to run SMC/CP/SDMA resume */
-	amdgpu_ttm_recover_gart(adev);
+	amdgpu_gtt_mgr_recover(&adev->mman.bdev.man[TTM_PL_TT]);
 
 	/* now we are okay to resume SMC/CP/SDMA */
 	amdgpu_sriov_reinit_late(adev);
@@ -3026,7 +3023,8 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)
 				DRM_ERROR("VRAM is lost!\n");
 				atomic_inc(&adev->vram_lost_counter);
 			}
-			r = amdgpu_ttm_recover_gart(adev);
+			r = amdgpu_gtt_mgr_recover(
+				&adev->mman.bdev.man[TTM_PL_TT]);
 			if (r)
 				goto out;
 			r = amdgpu_resume_phase2(adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +39 -14

116 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +15 -36

95 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +2 -1
index 39140ed88273..3c3406d9fc64 100644
@@ -69,6 +69,7 @@ extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
 
 bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem);
 uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man);
+int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man);
 
 uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man);
 uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man);
@@ -91,7 +92,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
 
 int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);
 int amdgpu_ttm_bind(struct ttm_buffer_object *bo);
-int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);
+int amdgpu_ttm_recover_gart(struct ttm_buffer_object *tbo);
 
 int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages);
 void amdgpu_ttm_tt_set_user_pages(struct ttm_tt *ttm, struct page **pages);
Signature · 6 lines
2.11.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#17 lore raw

PATCH 5/5 drm/amdgpu: don't flush the TLB before initializing GART

In reply to a message not in the archive

From: Christian König <[email protected]>

No point in doing this.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +7 -6
index f4370081f6e6..fe818501c520 100644
@@ -332,12 +332,13 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,
 		adev->gart.pages[p] = pagelist[i];
 #endif
 
-	if (adev->gart.ptr) {
-		r = amdgpu_gart_map(adev, offset, pages, dma_addr, flags,
-			    adev->gart.ptr);
-		if (r)
-			return r;
-	}
+	if (!adev->gart.ptr)
+		return 0;
+
+	r = amdgpu_gart_map(adev, offset, pages, dma_addr, flags,
+		    adev->gart.ptr);
+	if (r)
+		return r;
 
 	mb();
 	amdgpu_gart_flush_gpu_tlb(adev, 0);
Signature · 6 lines
2.11.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by
#18 lore raw
In reply to a message not in the archive
Quoted 16 lines · Christian König

From: Christian König <[email protected]>

Filter the placement mask before using it. In theory it could be that we have other flags set here as well.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0 -0
index dcdfb8d176fc..32c822f3db11 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem) · line 917

Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -1
@@ -910,7 +910,8 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem)
 	placement.busy_placement = &placements;
 	placements.fpfn = 0;
 	placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT;
-	placements.flags = bo->mem.placement | TTM_PL_FLAG_TT;
+	placements.flags = (bo->mem.placement & ~TTM_PL_MASK_MEM) |
+		TTM_PL_FLAG_TT;
 
 	r = ttm_bo_mem_space(bo, &placement, &tmp, true, false);
 	if (unlikely(r))

Patches 1, 3 & 5 are

Signature · 6 lines
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx