Skip to contentSkip to conversation

drm/amdkfd: use allowed domain for vmbo validation

PATCH Superseded Nirmoy Das 2 participants 4 messages Jun 8, 2021

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Nirmoy Das

author
#0 lore raw

PATCH 1/1 drm/amdkfd: use allowed domain for vmbo validation

Remove fixed domain and use BO's allowed domain for PT/PD BO validation.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -2
index d6cb7cf76623..a45eadfbf417 100644
@@ -336,7 +336,7 @@ static int amdgpu_amdkfd_bo_validate(struct amdgpu_bo *bo, uint32_t domain,
 		 "Called with userptr BO"))
 		return -EINVAL;
 
-	amdgpu_bo_placement_from_domain(bo, domain);
+	amdgpu_bo_placement_from_domain(bo, bo->allowed_domains);
 
 	ret = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
 	if (ret)
@@ -369,7 +369,6 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)
 	struct amdgpu_vm_parser param;
 	int ret;
 
-	param.domain = AMDGPU_GEM_DOMAIN_VRAM;
 	param.wait = false;
 
 	ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate,
Signature · 6 lines
2.31.1

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

Am 08.06.21 um 11:32 schrieb Nirmoy Das:

Quoted 2 lines

Remove fixed domain and use BO's allowed domain for PT/PD BO validation.

"Fixes handling when page tables are in system memory".

And I think you can now remove the validate structure as well.

Christian.

Quoted 20 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -1
index d6cb7cf76623..a45eadfbf417 100644
@@ -336,7 +336,7 @@ static int amdgpu_amdkfd_bo_validate(struct amdgpu_bo *bo, uint32_t domain,
  		 "Called with userptr BO"))
  		return -EINVAL;
 
-	amdgpu_bo_placement_from_domain(bo, domain);
+	amdgpu_bo_placement_from_domain(bo, bo->allowed_domains);
 
  	ret = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
  	if (ret)

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) · line 374

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0 -1
@@ -369,7 +369,6 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)
  	struct amdgpu_vm_parser param;
  	int ret;
 
-	param.domain = AMDGPU_GEM_DOMAIN_VRAM;
  	param.wait = false;
 
  	ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate,

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

#2 lore raw
Quoted 7 lines · Christian König

Am 08.06.21 um 11:32 schrieb Nirmoy Das:

Quoted 2 lines

Remove fixed domain and use BO's allowed domain for PT/PD BO validation.

"Fixes handling when page tables are in system memory".

And I think you can now remove the validate structure as well.

Do you mean " struct amdgpu_vm_parser param; " ?

Thanks,

Nirmoy

Quoted 20 lines

Christian.

Quoted 17 lines

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 +--

  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -0
index d6cb7cf76623..a45eadfbf417 100644
@@ -336,7 +336,7 @@ static int amdgpu_amdkfd_bo_validate(struct 
 amdgpu_bo *bo, uint32_t domain,
            "Called with userptr BO"))
           return -EINVAL;
   -    amdgpu_bo_placement_from_domain(bo, domain);
+    amdgpu_bo_placement_from_domain(bo, bo->allowed_domains);
         ret = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
Quoted 9 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c static int vm_validate_pt_pd_bos(struct amdgpu_vm · line 374

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0 -0
       if (ret)
@@ -369,7 +369,6 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm 
 *vm)
       struct amdgpu_vm_parser param;
       int ret;
   -    param.domain = AMDGPU_GEM_DOMAIN_VRAM;
       param.wait = false;
         ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate,

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

maintainer
#3 lore raw

Am 08.06.21 um 11:58 schrieb Das, Nirmoy:

Quoted 6 lines · Christian König
Quoted 4 lines

Am 08.06.21 um 11:32 schrieb Nirmoy Das:

Quoted 2 lines

Remove fixed domain and use BO's allowed domain for PT/PD BO validation.

Quoted 6 lines
Quoted 3 lines

"Fixes handling when page tables are in system memory".

And I think you can now remove the validate structure as well.

Do you mean " struct amdgpu_vm_parser param; " ?

Yes, exactly that one.

Christian.

Quoted 35 lines

Thanks,

Nirmoy

Quoted 29 lines

Christian.

Quoted 25 lines

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 +--

  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -0
index d6cb7cf76623..a45eadfbf417 100644
@@ -336,7 +336,7 @@ static int amdgpu_amdkfd_bo_validate(struct 
 amdgpu_bo *bo, uint32_t domain,
            "Called with userptr BO"))
           return -EINVAL;
   -    amdgpu_bo_placement_from_domain(bo, domain);
+    amdgpu_bo_placement_from_domain(bo, bo->allowed_domains);
         ret = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
       if (ret)
@@ -369,7 +369,6 @@ static int vm_validate_pt_pd_bos(struct 
 amdgpu_vm *vm)
       struct amdgpu_vm_parser param;
       int ret;
   -    param.domain = AMDGPU_GEM_DOMAIN_VRAM;
       param.wait = false;
         ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate,

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