Skip to contentSkip to conversation

drm/amdgpu: Set pasid for compute vm

PATCH In review Oak Zeng 4 participants 5 messages Aug 22, 2018 – Aug 27, 2018 3 messages not in the archive

Subsystems (3)
lore
Share & tools
lore

Oak Zeng

author
#0 lore raw

PATCH 1/1 drm/amdgpu: Set pasid for compute vm

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h       |  4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c |  8 ++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c           | 20 +++++++++++++++++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h           |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c         |  4 ++--
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h  |  4 ++--
 6 files changed, 28 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +2 -2
index a8418a3..8939f54 100644
@@ -157,11 +157,11 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd);
 /* GPUVM API */
 int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
 					void **process_info,
-					struct dma_fence **ef);
+					struct dma_fence **ef, unsigned int pasid);
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
 					struct file *filp,
 					void **vm, void **process_info,
-					struct dma_fence **ef);
+					struct dma_fence **ef, unsigned int pasid);
 void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev,
 				struct amdgpu_vm *vm);
 void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -4
index 7eadc58..659c397 100644
@@ -1005,7 +1005,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info,
 
 int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
 					  void **process_info,
-					  struct dma_fence **ef)
+					  struct dma_fence **ef, unsigned int pasid)
 {
 	struct amdgpu_device *adev = get_amdgpu_device(kgd);
 	struct amdgpu_vm *new_vm;
@@ -1016,7 +1016,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
 		return -ENOMEM;
 
 	/* Initialize AMDGPU part of the VM */
-	ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, 0);
+	ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, pasid);
 	if (ret) {
 		pr_err("Failed init vm ret %d\n", ret);
 		goto amdgpu_vm_init_fail;
@@ -1041,7 +1041,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
 					   struct file *filp,
 					   void **vm, void **process_info,
-					   struct dma_fence **ef)
+					   struct dma_fence **ef, unsigned int pasid)
 {
 	struct amdgpu_device *adev = get_amdgpu_device(kgd);
 	struct drm_file *drm_priv = filp->private_data;
@@ -1054,7 +1054,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
 		return -EINVAL;
 
 	/* Convert VM into a compute VM */
-	ret = amdgpu_vm_make_compute(adev, avm);
+	ret = amdgpu_vm_make_compute(adev, avm, pasid);
 	if (ret)
 		return ret;
 
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +17 -3
index 662aec5..0f6b304 100644
@@ -2690,7 +2690,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
  * Returns:
  * 0 for success, -errno for errors.
  */
-int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
+int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, unsigned int pasid)
 {
 	bool pte_support_ats = (adev->asic_type == CHIP_RAVEN);
 	int r;
@@ -2705,6 +2705,18 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
 		goto error;
 	}
 
+	if (vm->pasid) {
+		unsigned long flags;
+
+		spin_lock_irqsave(&adev->vm_manager.pasid_lock, flags);
+		r = idr_alloc(&adev->vm_manager.pasid_idr, vm, pasid, pasid + 1,
+			      GFP_ATOMIC);
+		spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, flags);
+
+		if (r < 0)
+			goto error;
+	}
+
 	/* Check if PD needs to be reinitialized and do it before
 	 * changing any other state, in case it fails.
 	 */
@@ -2713,7 +2725,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
 			       adev->vm_manager.root_level,
 			       pte_support_ats);
 		if (r)
-			goto error;
+			goto error_idr_free;
 	}
 
 	/* Update VM state */
@@ -2732,9 +2744,11 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
 		idr_remove(&adev->vm_manager.pasid_idr, vm->pasid);
 		spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, flags);
 
-		vm->pasid = 0;
+		vm->pasid = pasid;
 	}
 
+error_idr_free:
+	idr_remove(&adev->vm_manager.pasid_idr, pasid);
 error:
 	amdgpu_bo_unreserve(vm->root.base.bo);
 	return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1 -1
index 1162c2b..c68945d 100644
@@ -294,7 +294,7 @@ void amdgpu_vm_manager_init(struct amdgpu_device *adev);
 void amdgpu_vm_manager_fini(struct amdgpu_device *adev);
 int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
 		   int vm_context, unsigned int pasid);
-int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm);
+int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, unsigned int pasid);
 void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm);
 bool amdgpu_vm_pasid_fault_credit(struct amdgpu_device *adev,
 				  unsigned int pasid);
drivers/gpu/drm/amd/amdkfd/kfd_process.c +2 -2
index 1d80b4f..19541b2 100644
@@ -686,10 +686,10 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,
 	if (drm_file)
 		ret = dev->kfd2kgd->acquire_process_vm(
 			dev->kgd, drm_file,
-			&pdd->vm, &p->kgd_process_info, &p->ef);
+			&pdd->vm, &p->kgd_process_info, &p->ef, p->pasid);
 	else
 		ret = dev->kfd2kgd->create_process_vm(
-			dev->kgd, &pdd->vm, &p->kgd_process_info, &p->ef);
+			dev->kgd, &pdd->vm, &p->kgd_process_info, &p->ef, p->pasid);
 	if (ret) {
 		pr_err("Failed to create process VM object\n");
 		return ret;
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +2 -2
index 5733fbe..0171533 100644
@@ -347,9 +347,9 @@ struct kfd2kgd_calls {
 	uint64_t (*get_vram_usage)(struct kgd_dev *kgd);
 
 	int (*create_process_vm)(struct kgd_dev *kgd, void **vm,
-			void **process_info, struct dma_fence **ef);
+			void **process_info, struct dma_fence **ef, unsigned int pasid);
 	int (*acquire_process_vm)(struct kgd_dev *kgd, struct file *filp,
-			void **vm, void **process_info, struct dma_fence **ef);
+			void **vm, void **process_info, struct dma_fence **ef, unsigned int pasid);
 	void (*destroy_process_vm)(struct kgd_dev *kgd, void *vm);
 	uint32_t (*get_process_page_dir)(void *vm);
 	void (*set_vm_context_page_table_base)(struct kgd_dev *kgd,
Signature · 6 lines
2.7.4

_______________________________________________
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): 1534972251-7979-1-git-send-email-Oak.Zeng-5C7GfCeVMHo@public.gmane.org

#2 lore raw

See comments inline ...

Regards,
  Felix

Quoted 15 lines · Oak Zeng
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h       |  4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c |  8 ++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c           | 20 +++++++++++++++++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h           |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c         |  4 ++--
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h  |  4 ++--
 6 files changed, 28 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +0 -0
index a8418a3..8939f54 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd); · line 160

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 -1
@@ -157,11 +157,11 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd);
 /* GPUVM API */
 int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
 					void **process_info,
-					struct dma_fence **ef);
+					struct dma_fence **ef, unsigned int pasid);

vm, process_info and ef are output parameters. pasid is an input parameter. I'd add that before the output parameters.

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd); · line 164

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 -1
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
 					struct file *filp,
 					void **vm, void **process_info,
-					struct dma_fence **ef);
+					struct dma_fence **ef, unsigned int pasid);

Same as above.

Quoted 57 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +0 -0
 void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev,
 				struct amdgpu_vm *vm);
 void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -4
index 7eadc58..659c397 100644
@@ -1005,7 +1005,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info,
 
 int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
 					  void **process_info,
-					  struct dma_fence **ef)
+					  struct dma_fence **ef, unsigned int pasid)
 {
 	struct amdgpu_device *adev = get_amdgpu_device(kgd);
 	struct amdgpu_vm *new_vm;
@@ -1016,7 +1016,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
 		return -ENOMEM;
 
 	/* Initialize AMDGPU part of the VM */
-	ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, 0);
+	ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, pasid);
 	if (ret) {
 		pr_err("Failed init vm ret %d\n", ret);
 		goto amdgpu_vm_init_fail;
@@ -1041,7 +1041,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
 					   struct file *filp,
 					   void **vm, void **process_info,
-					   struct dma_fence **ef)
+					   struct dma_fence **ef, unsigned int pasid)
 {
 	struct amdgpu_device *adev = get_amdgpu_device(kgd);
 	struct drm_file *drm_priv = filp->private_data;
@@ -1054,7 +1054,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
 		return -EINVAL;
 
 	/* Convert VM into a compute VM */
-	ret = amdgpu_vm_make_compute(adev, avm);
+	ret = amdgpu_vm_make_compute(adev, avm, pasid);
 	if (ret)
 		return ret;
 
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
index 662aec5..0f6b304 100644
@@ -2690,7 +2690,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
  * Returns:
  * 0 for success, -errno for errors.
  */
-int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
+int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, unsigned int pasid)
 {
 	bool pte_support_ats = (adev->asic_type == CHIP_RAVEN);
 	int r;

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm) · line 2708

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -0
@@ -2705,6 +2705,18 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
 		goto error;
 	}
 
+	if (vm->pasid) {

This condition should be if (pasid). Or if we always expect a valid pasid, then you don't need the condition at all.

Quoted 24 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +12 -1
+		unsigned long flags;
+
+		spin_lock_irqsave(&adev->vm_manager.pasid_lock, flags);
+		r = idr_alloc(&adev->vm_manager.pasid_idr, vm, pasid, pasid + 1,
+			      GFP_ATOMIC);
+		spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, flags);
+
+		if (r < 0)
+			goto error;
+	}
+
 	/* Check if PD needs to be reinitialized and do it before
 	 * changing any other state, in case it fails.
 	 */
@@ -2713,7 +2725,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
 			       adev->vm_manager.root_level,
 			       pte_support_ats);
 		if (r)
-			goto error;
+			goto error_idr_free;
 	}
 
 	/* Update VM state */

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm) · line 2747

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
@@ -2732,9 +2744,11 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
 		idr_remove(&adev->vm_manager.pasid_idr, vm->pasid);
 		spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, flags);
 
-		vm->pasid = 0;
+		vm->pasid = pasid;

This is in the wrong place, because you only assign vm->pasid if the VM had a pasid to begin with.

Quoted 43 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -0
 	}
 
+error_idr_free:
+	idr_remove(&adev->vm_manager.pasid_idr, pasid);
 error:
 	amdgpu_bo_unreserve(vm->root.base.bo);
 	return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1 -1
index 1162c2b..c68945d 100644
@@ -294,7 +294,7 @@ void amdgpu_vm_manager_init(struct amdgpu_device *adev);
 void amdgpu_vm_manager_fini(struct amdgpu_device *adev);
 int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
 		   int vm_context, unsigned int pasid);
-int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm);
+int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, unsigned int pasid);
 void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm);
 bool amdgpu_vm_pasid_fault_credit(struct amdgpu_device *adev,
 				  unsigned int pasid);
drivers/gpu/drm/amd/amdkfd/kfd_process.c +2 -2
index 1d80b4f..19541b2 100644
@@ -686,10 +686,10 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,
 	if (drm_file)
 		ret = dev->kfd2kgd->acquire_process_vm(
 			dev->kgd, drm_file,
-			&pdd->vm, &p->kgd_process_info, &p->ef);
+			&pdd->vm, &p->kgd_process_info, &p->ef, p->pasid);
 	else
 		ret = dev->kfd2kgd->create_process_vm(
-			dev->kgd, &pdd->vm, &p->kgd_process_info, &p->ef);
+			dev->kgd, &pdd->vm, &p->kgd_process_info, &p->ef, p->pasid);
 	if (ret) {
 		pr_err("Failed to create process VM object\n");
 		return ret;
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +0 -0
index 5733fbe..0171533 100644
@@ -347,9 +347,9 @@ struct kfd2kgd_calls {
 	uint64_t (*get_vram_usage)(struct kgd_dev *kgd);

drivers/gpu/drm/amd/include/kgd_kfd_interface.h struct kfd2kgd_calls { · line 355

Quoted 10 lines
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +2 -2
 
 	int (*create_process_vm)(struct kgd_dev *kgd, void **vm,
-			void **process_info, struct dma_fence **ef);
+			void **process_info, struct dma_fence **ef, unsigned int pasid);
 	int (*acquire_process_vm)(struct kgd_dev *kgd, struct file *filp,
-			void **vm, void **process_info, struct dma_fence **ef);
+			void **vm, void **process_info, struct dma_fence **ef, unsigned int pasid);
 	void (*destroy_process_vm)(struct kgd_dev *kgd, void *vm);
 	uint32_t (*get_process_page_dir)(void *vm);
 	void (*set_vm_context_page_table_base)(struct kgd_dev *kgd,

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

#3 lore raw
In reply to a message not in the archive
Quoted 1 line · Oak Zeng

Please provide a patch description.

Alex

Quoted 171 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h       |  4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c |  8 ++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c           | 20 +++++++++++++++++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h           |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c         |  4 ++--
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h  |  4 ++--
 6 files changed, 28 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +2 -2
index a8418a3..8939f54 100644
@@ -157,11 +157,11 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd);
 /* GPUVM API */
 int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
                                        void **process_info,
-                                       struct dma_fence **ef);
+                                       struct dma_fence **ef, unsigned int pasid);
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
                                        struct file *filp,
                                        void **vm, void **process_info,
-                                       struct dma_fence **ef);
+                                       struct dma_fence **ef, unsigned int pasid);
 void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev,
                                struct amdgpu_vm *vm);
 void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -4
index 7eadc58..659c397 100644
@@ -1005,7 +1005,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info,
 
 int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
                                          void **process_info,
-                                         struct dma_fence **ef)
+                                         struct dma_fence **ef, unsigned int pasid)
 {
        struct amdgpu_device *adev = get_amdgpu_device(kgd);
        struct amdgpu_vm *new_vm;
@@ -1016,7 +1016,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
                return -ENOMEM;
 
        /* Initialize AMDGPU part of the VM */
-       ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, 0);
+       ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, pasid);
        if (ret) {
                pr_err("Failed init vm ret %d\n", ret);
                goto amdgpu_vm_init_fail;
@@ -1041,7 +1041,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
                                           struct file *filp,
                                           void **vm, void **process_info,
-                                          struct dma_fence **ef)
+                                          struct dma_fence **ef, unsigned int pasid)
 {
        struct amdgpu_device *adev = get_amdgpu_device(kgd);
        struct drm_file *drm_priv = filp->private_data;
@@ -1054,7 +1054,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
                return -EINVAL;
 
        /* Convert VM into a compute VM */
-       ret = amdgpu_vm_make_compute(adev, avm);
+       ret = amdgpu_vm_make_compute(adev, avm, pasid);
        if (ret)
                return ret;
 
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +17 -3
index 662aec5..0f6b304 100644
@@ -2690,7 +2690,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
  * Returns:
  * 0 for success, -errno for errors.
  */
-int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
+int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, unsigned int pasid)
 {
        bool pte_support_ats = (adev->asic_type == CHIP_RAVEN);
        int r;
@@ -2705,6 +2705,18 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
                goto error;
        }
 
+       if (vm->pasid) {
+               unsigned long flags;
+
+               spin_lock_irqsave(&adev->vm_manager.pasid_lock, flags);
+               r = idr_alloc(&adev->vm_manager.pasid_idr, vm, pasid, pasid + 1,
+                             GFP_ATOMIC);
+               spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, flags);
+
+               if (r < 0)
+                       goto error;
+       }
+
        /* Check if PD needs to be reinitialized and do it before
         * changing any other state, in case it fails.
         */
@@ -2713,7 +2725,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
                               adev->vm_manager.root_level,
                               pte_support_ats);
                if (r)
-                       goto error;
+                       goto error_idr_free;
        }
 
        /* Update VM state */
@@ -2732,9 +2744,11 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
                idr_remove(&adev->vm_manager.pasid_idr, vm->pasid);
                spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, flags);
 
-               vm->pasid = 0;
+               vm->pasid = pasid;
        }
 
+error_idr_free:
+       idr_remove(&adev->vm_manager.pasid_idr, pasid);
 error:
        amdgpu_bo_unreserve(vm->root.base.bo);
        return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1 -1
index 1162c2b..c68945d 100644
@@ -294,7 +294,7 @@ void amdgpu_vm_manager_init(struct amdgpu_device *adev);
 void amdgpu_vm_manager_fini(struct amdgpu_device *adev);
 int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
                   int vm_context, unsigned int pasid);
-int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm);
+int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, unsigned int pasid);
 void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm);
 bool amdgpu_vm_pasid_fault_credit(struct amdgpu_device *adev,
                                  unsigned int pasid);
drivers/gpu/drm/amd/amdkfd/kfd_process.c +2 -2
index 1d80b4f..19541b2 100644
@@ -686,10 +686,10 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,
        if (drm_file)
                ret = dev->kfd2kgd->acquire_process_vm(
                        dev->kgd, drm_file,
-                       &pdd->vm, &p->kgd_process_info, &p->ef);
+                       &pdd->vm, &p->kgd_process_info, &p->ef, p->pasid);
        else
                ret = dev->kfd2kgd->create_process_vm(
-                       dev->kgd, &pdd->vm, &p->kgd_process_info, &p->ef);
+                       dev->kgd, &pdd->vm, &p->kgd_process_info, &p->ef, p->pasid);
        if (ret) {
                pr_err("Failed to create process VM object\n");
                return ret;
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +2 -3
index 5733fbe..0171533 100644
@@ -347,9 +347,9 @@ struct kfd2kgd_calls {
        uint64_t (*get_vram_usage)(struct kgd_dev *kgd);
 
        int (*create_process_vm)(struct kgd_dev *kgd, void **vm,
-                       void **process_info, struct dma_fence **ef);
+                       void **process_info, struct dma_fence **ef, unsigned int pasid);
        int (*acquire_process_vm)(struct kgd_dev *kgd, struct file *filp,
-                       void **vm, void **process_info, struct dma_fence **ef);
+                       void **vm, void **process_info, struct dma_fence **ef, unsigned int pasid);
        void (*destroy_process_vm)(struct kgd_dev *kgd, void *vm);
        uint32_t (*get_process_page_dir)(void *vm);
        void (*set_vm_context_page_table_base)(struct kgd_dev *kgd,
--

2.7.4

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): CADnq5_NRxXvRNVbc2ePjFV2u4Jkih3AKOVOXeLDESi8t3qHz4A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#5 lore raw

Yes I will add more description. Plus some fixes to Felix's comment, I will work out a v2.

Thanks,
Oak

-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Wednesday, August 22, 2018 5:47 PM
To: ozeng <[email protected]>
Cc: amd-gfx list <[email protected]>; Zeng, Oak <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: Set pasid for compute vm

Quoted 1 line · Oak Zeng

Please provide a patch description.

Alex

Quoted 194 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h       |  4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c |  8 ++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c           | 20 +++++++++++++++++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h           |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c         |  4 ++--
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h  |  4 ++--
 6 files changed, 28 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +4 -2
index a8418a3..8939f54 100644
@@ -157,11 +157,11 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct 
 kgd_dev *kgd);
 /* GPUVM API */
 int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
                                        void **process_info,
-                                       struct dma_fence **ef);
+                                       struct dma_fence **ef, 
+ unsigned int pasid);
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
                                        struct file *filp,
                                        void **vm, void **process_info,
-                                       struct dma_fence **ef);
+                                       struct dma_fence **ef, 
+ unsigned int pasid);
 void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev,
                                struct amdgpu_vm *vm);  void 

amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm);

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -2
index 7eadc58..659c397 100644
@@ -1005,7 +1005,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, 
 void **process_info,
 
 int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
                                          void **process_info,
-                                         struct dma_fence **ef)
+                                         struct dma_fence **ef, 
+ unsigned int pasid)
 {
        struct amdgpu_device *adev = get_amdgpu_device(kgd);
        struct amdgpu_vm *new_vm;
@@ -1016,7 +1016,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
                return -ENOMEM;
 
        /* Initialize AMDGPU part of the VM */
-       ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, 0);
+       ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, 
+ pasid);
        if (ret) {
                pr_err("Failed init vm ret %d\n", ret);
                goto amdgpu_vm_init_fail; @@ -1041,7 +1041,7 @@ int 

amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm, int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
struct file *filp, void **vm, void **process_info,

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -2
-                                          struct dma_fence **ef)
+                                          struct dma_fence **ef, 
+ unsigned int pasid)
 {
        struct amdgpu_device *adev = get_amdgpu_device(kgd);
        struct drm_file *drm_priv = filp->private_data; @@ -1054,7 
+1054,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
                return -EINVAL;
 
        /* Convert VM into a compute VM */
-       ret = amdgpu_vm_make_compute(adev, avm);
+       ret = amdgpu_vm_make_compute(adev, avm, pasid);
        if (ret)
                return ret;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +19 -3
index 662aec5..0f6b304 100644
@@ -2690,7 +2690,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
  * Returns:
  * 0 for success, -errno for errors.
  */
-int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct 
 amdgpu_vm *vm)
+int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct 
+amdgpu_vm *vm, unsigned int pasid)
 {
        bool pte_support_ats = (adev->asic_type == CHIP_RAVEN);
        int r;
@@ -2705,6 +2705,18 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
                goto error;
        }
 
+       if (vm->pasid) {
+               unsigned long flags;
+
+               spin_lock_irqsave(&adev->vm_manager.pasid_lock, flags);
+               r = idr_alloc(&adev->vm_manager.pasid_idr, vm, pasid, pasid + 1,
+                             GFP_ATOMIC);
+               spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, 
+ flags);
+
+               if (r < 0)
+                       goto error;
+       }
+
        /* Check if PD needs to be reinitialized and do it before
         * changing any other state, in case it fails.
         */
@@ -2713,7 +2725,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
                               adev->vm_manager.root_level,
                               pte_support_ats);
                if (r)
-                       goto error;
+                       goto error_idr_free;
        }
 
        /* Update VM state */
@@ -2732,9 +2744,11 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
                idr_remove(&adev->vm_manager.pasid_idr, vm->pasid);
                spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, 
 flags);
 
-               vm->pasid = 0;
+               vm->pasid = pasid;
        }
 
+error_idr_free:
+       idr_remove(&adev->vm_manager.pasid_idr, pasid);
 error:
        amdgpu_bo_unreserve(vm->root.base.bo);
        return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +0 -0
index 1162c2b..c68945d 100644
@@ -294,7 +294,7 @@ void amdgpu_vm_manager_init(struct amdgpu_device 
 *adev);  void amdgpu_vm_manager_fini(struct amdgpu_device *adev);  int 
 amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
                   int vm_context, unsigned int pasid); -int 

amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm);

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +2 -0
+int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct 
+amdgpu_vm *vm, unsigned int pasid);
 void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm 

*vm); bool amdgpu_vm_pasid_fault_credit(struct amdgpu_device *adev,

                                  unsigned int pasid); diff --git 

a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 1d80b4f..19541b2 100644

drivers/gpu/drm/amd/amdkfd/kfd_process.c +4 -2
@@ -686,10 +686,10 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,
        if (drm_file)
                ret = dev->kfd2kgd->acquire_process_vm(
                        dev->kgd, drm_file,
-                       &pdd->vm, &p->kgd_process_info, &p->ef);
+                       &pdd->vm, &p->kgd_process_info, &p->ef, 
+ p->pasid);
        else
                ret = dev->kfd2kgd->create_process_vm(
-                       dev->kgd, &pdd->vm, &p->kgd_process_info, &p->ef);
+                       dev->kgd, &pdd->vm, &p->kgd_process_info, 
+ &p->ef, p->pasid);
        if (ret) {
                pr_err("Failed to create process VM object\n");
                return ret;
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +4 -3
index 5733fbe..0171533 100644
@@ -347,9 +347,9 @@ struct kfd2kgd_calls {
        uint64_t (*get_vram_usage)(struct kgd_dev *kgd);
 
        int (*create_process_vm)(struct kgd_dev *kgd, void **vm,
-                       void **process_info, struct dma_fence **ef);
+                       void **process_info, struct dma_fence **ef, 
+ unsigned int pasid);
        int (*acquire_process_vm)(struct kgd_dev *kgd, struct file *filp,
-                       void **vm, void **process_info, struct dma_fence **ef);
+                       void **vm, void **process_info, struct 
+ dma_fence **ef, unsigned int pasid);
        void (*destroy_process_vm)(struct kgd_dev *kgd, void *vm);
        uint32_t (*get_process_page_dir)(void *vm);
        void (*set_vm_context_page_table_base)(struct kgd_dev *kgd,
--

2.7.4

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): BN6PR12MB165108717E54259E9AA64E3480360-/b2+HYfkarRSqX7PDniLCgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#7 lore raw

Hi Alex/Felix,

I submitted a new patch to address below comments.

I also come up with another patch to release a compute vm on kfd process destroy, to address a pasid duplicate release (from both kfd and amdgpu side)issue.

Please help to review.

Thanks,
Oak

-----Original Message-----
From: Zeng, Oak
Sent: Friday, August 24, 2018 12:53 PM
To: 'Alex Deucher' <[email protected]>; ozeng <[email protected]>
Cc: amd-gfx list <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: Set pasid for compute vm

Yes I will add more description. Plus some fixes to Felix's comment, I will work out a v2.

Thanks,
Oak

-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Wednesday, August 22, 2018 5:47 PM
To: ozeng <[email protected]>
Cc: amd-gfx list <[email protected]>; Zeng, Oak <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: Set pasid for compute vm

Quoted 1 line · Oak Zeng

Please provide a patch description.

Alex

Quoted 195 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h       |  4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c |  8 ++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c           | 20 +++++++++++++++++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h           |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c         |  4 ++--
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h  |  4 ++--
 6 files changed, 28 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +4 -2
index a8418a3..8939f54 100644
@@ -157,11 +157,11 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct
 kgd_dev *kgd);
 /* GPUVM API */
 int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
                                        void **process_info,
-                                       struct dma_fence **ef);
+                                       struct dma_fence **ef, 
+ unsigned int pasid);
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
                                        struct file *filp,
                                        void **vm, void **process_info,
-                                       struct dma_fence **ef);
+                                       struct dma_fence **ef, 
+ unsigned int pasid);
 void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev,
                                struct amdgpu_vm *vm);  void 

amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm);

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -2
index 7eadc58..659c397 100644
@@ -1005,7 +1005,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, 
 void **process_info,
 
 int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
                                          void **process_info,
-                                         struct dma_fence **ef)
+                                         struct dma_fence **ef, 
+ unsigned int pasid)
 {
        struct amdgpu_device *adev = get_amdgpu_device(kgd);
        struct amdgpu_vm *new_vm;
@@ -1016,7 +1016,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
                return -ENOMEM;
 
        /* Initialize AMDGPU part of the VM */
-       ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, 0);
+       ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, 
+ pasid);
        if (ret) {
                pr_err("Failed init vm ret %d\n", ret);
                goto amdgpu_vm_init_fail; @@ -1041,7 +1041,7 @@ int 

amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm, int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd,
struct file *filp, void **vm, void **process_info,

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +5 -2
-                                          struct dma_fence **ef)
+                                          struct dma_fence **ef, 
+ unsigned int pasid)
 {
        struct amdgpu_device *adev = get_amdgpu_device(kgd);
        struct drm_file *drm_priv = filp->private_data; @@ -1054,7
+1054,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev 
+*kgd,
                return -EINVAL;
 
        /* Convert VM into a compute VM */
-       ret = amdgpu_vm_make_compute(adev, avm);
+       ret = amdgpu_vm_make_compute(adev, avm, pasid);
        if (ret)
                return ret;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +19 -3
index 662aec5..0f6b304 100644
@@ -2690,7 +2690,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
  * Returns:
  * 0 for success, -errno for errors.
  */
-int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct 
 amdgpu_vm *vm)
+int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct 
+amdgpu_vm *vm, unsigned int pasid)
 {
        bool pte_support_ats = (adev->asic_type == CHIP_RAVEN);
        int r;
@@ -2705,6 +2705,18 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
                goto error;
        }
 
+       if (vm->pasid) {
+               unsigned long flags;
+
+               spin_lock_irqsave(&adev->vm_manager.pasid_lock, flags);
+               r = idr_alloc(&adev->vm_manager.pasid_idr, vm, pasid, pasid + 1,
+                             GFP_ATOMIC);
+               spin_unlock_irqrestore(&adev->vm_manager.pasid_lock,
+ flags);
+
+               if (r < 0)
+                       goto error;
+       }
+
        /* Check if PD needs to be reinitialized and do it before
         * changing any other state, in case it fails.
         */
@@ -2713,7 +2725,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
                               adev->vm_manager.root_level,
                               pte_support_ats);
                if (r)
-                       goto error;
+                       goto error_idr_free;
        }
 
        /* Update VM state */
@@ -2732,9 +2744,11 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
                idr_remove(&adev->vm_manager.pasid_idr, vm->pasid);
                spin_unlock_irqrestore(&adev->vm_manager.pasid_lock,
 flags);
 
-               vm->pasid = 0;
+               vm->pasid = pasid;
        }
 
+error_idr_free:
+       idr_remove(&adev->vm_manager.pasid_idr, pasid);
 error:
        amdgpu_bo_unreserve(vm->root.base.bo);
        return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +0 -0
index 1162c2b..c68945d 100644
@@ -294,7 +294,7 @@ void amdgpu_vm_manager_init(struct amdgpu_device 
 *adev);  void amdgpu_vm_manager_fini(struct amdgpu_device *adev);  int 
 amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
                   int vm_context, unsigned int pasid); -int 

amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm);

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +2 -0
+int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct 
+amdgpu_vm *vm, unsigned int pasid);
 void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm 

*vm); bool amdgpu_vm_pasid_fault_credit(struct amdgpu_device *adev,

                                  unsigned int pasid); diff --git 

a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 1d80b4f..19541b2 100644

drivers/gpu/drm/amd/amdkfd/kfd_process.c +4 -2
@@ -686,10 +686,10 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,
        if (drm_file)
                ret = dev->kfd2kgd->acquire_process_vm(
                        dev->kgd, drm_file,
-                       &pdd->vm, &p->kgd_process_info, &p->ef);
+                       &pdd->vm, &p->kgd_process_info, &p->ef,
+ p->pasid);
        else
                ret = dev->kfd2kgd->create_process_vm(
-                       dev->kgd, &pdd->vm, &p->kgd_process_info, &p->ef);
+                       dev->kgd, &pdd->vm, &p->kgd_process_info, 
+ &p->ef, p->pasid);
        if (ret) {
                pr_err("Failed to create process VM object\n");
                return ret;
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +4 -3
index 5733fbe..0171533 100644
@@ -347,9 +347,9 @@ struct kfd2kgd_calls {
        uint64_t (*get_vram_usage)(struct kgd_dev *kgd);
 
        int (*create_process_vm)(struct kgd_dev *kgd, void **vm,
-                       void **process_info, struct dma_fence **ef);
+                       void **process_info, struct dma_fence **ef, 
+ unsigned int pasid);
        int (*acquire_process_vm)(struct kgd_dev *kgd, struct file *filp,
-                       void **vm, void **process_info, struct dma_fence **ef);
+                       void **vm, void **process_info, struct 
+ dma_fence **ef, unsigned int pasid);
        void (*destroy_process_vm)(struct kgd_dev *kgd, void *vm);
        uint32_t (*get_process_page_dir)(void *vm);
        void (*set_vm_context_page_table_base)(struct kgd_dev *kgd,
--

2.7.4

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