Skip to contentSkip to conversation

drm/amdgpu: return early for preempt type BOs

PATCH Superseded Nirmoy Das 2 participants 3 messages Jun 25, 2021 – Jun 28, 2021

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Nirmoy Das

author
#0 lore raw

PATCH 1/2 drm/amdgpu: return early for preempt type BOs

Return early for AMDGPU_PL_PREEMPT BOs so that we don't pass wrong pointer to amdgpu_gtt_mgr_has_gart_addr() which assumes ttm_resource argument to be TTM_PL_TT type BO's.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +5 -0
index b46726e47bce..3df06772a425 100644
@@ -926,6 +926,11 @@ static int amdgpu_ttm_backend_bind(struct ttm_device *bdev,
 	    bo_mem->mem_type == AMDGPU_PL_OA)
 		return -EINVAL;
 
+	if (bo_mem->mem_type == AMDGPU_PL_PREEMPT) {
+		gtt->offset = AMDGPU_BO_INVALID_OFFSET;
+		return 0;
+	}
+
 	if (!amdgpu_gtt_mgr_has_gart_addr(bo_mem)) {
 		gtt->offset = AMDGPU_BO_INVALID_OFFSET;
 		return 0;
Signature · 6 lines
2.32.0

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

PATCH 2/2 drm/amdgpu: raise error on incorrect mem_type

Be more defensive and raise error on wrong mem_type argument in amdgpu_gtt_mgr_has_gart_addr().

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +5 -1
index 543000304a1c..0b0fa87b115c 100644
@@ -107,8 +107,12 @@ const struct attribute_group amdgpu_gtt_mgr_attr_group = {
  */
 bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_resource *res)
 {
-	struct amdgpu_gtt_node *node = to_amdgpu_gtt_node(res);
+	struct amdgpu_gtt_node *node;
+
+	if (WARN_ON(res->mem_type != TTM_PL_TT))
+		return false;
 
+	node = to_amdgpu_gtt_node(res);
 	return drm_mm_node_allocated(&node->base.mm_nodes[0]);
 }
 
Signature · 6 lines
2.32.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#2 lore raw
In reply to Nirmoy Das

Am 25.06.21 um 19:28 schrieb Nirmoy Das:

Quoted 14 lines

Return early for AMDGPU_PL_PREEMPT BOs so that we don't pass wrong pointer to amdgpu_gtt_mgr_has_gart_addr() which assumes ttm_resource argument to be TTM_PL_TT type BO's.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0 -0
index b46726e47bce..3df06772a425 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c static int amdgpu_ttm_backend_bind(struct ttm_device *bdev, · line 929

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -0
@@ -926,6 +926,11 @@ static int amdgpu_ttm_backend_bind(struct ttm_device *bdev,
  	    bo_mem->mem_type == AMDGPU_PL_OA)
  		return -EINVAL;
 
+	if (bo_mem->mem_type == AMDGPU_PL_PREEMPT) {

Probably better to merge that into the if below.

E.g. if bo_mem->mem_type != TTM_PL_TT || .....

Christian.

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +4 -0
+		gtt->offset = AMDGPU_BO_INVALID_OFFSET;
+		return 0;
+	}
+
  	if (!amdgpu_gtt_mgr_has_gart_addr(bo_mem)) {
  		gtt->offset = AMDGPU_BO_INVALID_OFFSET;
  		return 0;