aboutsummaryrefslogtreecommitdiffstats
path: root/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1511-drm-amdgpu-Modify-create_process_vm-interface.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1511-drm-amdgpu-Modify-create_process_vm-interface.patch')
-rw-r--r--meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1511-drm-amdgpu-Modify-create_process_vm-interface.patch114
1 files changed, 0 insertions, 114 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1511-drm-amdgpu-Modify-create_process_vm-interface.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1511-drm-amdgpu-Modify-create_process_vm-interface.patch
deleted file mode 100644
index b5e3a098..00000000
--- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1511-drm-amdgpu-Modify-create_process_vm-interface.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 1a4f567b60378a6cf3d965cc50a51e53be5b8d7e Mon Sep 17 00:00:00 2001
-From: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
-Date: Mon, 27 Jun 2016 15:30:45 -0400
-Subject: [PATCH 1511/4131] drm/amdgpu: Modify create_process_vm interface
-
-Modify create_process_vm to accommodate master VM. KFD process chooses
-the VM of the first device detected to be the master VM. This
-information is passed on to KGD via create_process_interface.
-
-Change-Id: I8b5fd102f1f598673af0c936b718b1d7d8d235a3
-Signed-off-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 ++-
- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 12 +++++++++++-
- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 ++
- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 5 ++++-
- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 3 ++-
- 5 files changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
-index b66b03a..b14c2f3 100755
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
-@@ -159,7 +159,8 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(
- int amdgpu_amdkfd_gpuvm_unmap_memory_from_gpu(
- struct kgd_dev *kgd, struct kgd_mem *mem, void *vm);
-
--int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm);
-+int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
-+ void *master_vm);
- void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm);
-
- uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *vm);
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
-index 123adfb..54ff3de 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
-@@ -1034,7 +1034,8 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(
- return ret;
- }
-
--int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm)
-+int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
-+ void *master_vm)
- {
- int ret;
- struct amdkfd_vm *new_vm;
-@@ -1061,6 +1062,15 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm)
- mutex_init(&new_vm->lock);
- INIT_LIST_HEAD(&new_vm->kfd_bo_list);
- INIT_LIST_HEAD(&new_vm->kfd_vm_list);
-+
-+ if (master_vm == NULL)
-+ new_vm->master = new_vm;
-+ else {
-+ new_vm->master = master_vm;
-+ list_add_tail(&new_vm->kfd_vm_list,
-+ &((struct amdkfd_vm *)master_vm)->kfd_vm_list);
-+ }
-+ new_vm->master->n_vms++;
- *vm = (void *) new_vm;
-
- /*
-diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
-index b4b7281..a672a72 100644
---- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
-+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
-@@ -669,6 +669,8 @@ struct kfd_process {
- size_t debug_event_count;
-
- struct rb_root bo_interval_tree;
-+
-+ void *master_vm;
- };
-
- /**
-diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
-index c98b5da..87dd412 100644
---- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
-+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
-@@ -733,12 +733,15 @@ struct kfd_process_device *kfd_create_process_device_data(struct kfd_dev *dev,
- idr_init(&pdd->alloc_idr);
-
- /* Create the GPUVM context for this specific device */
-- if (dev->kfd2kgd->create_process_vm(dev->kgd, &pdd->vm)) {
-+ if (dev->kfd2kgd->create_process_vm(dev->kgd, &pdd->vm,
-+ p->master_vm)) {
- pr_err("Failed to create process VM object\n");
- list_del(&pdd->per_device_list);
- kfree(pdd);
- pdd = NULL;
- }
-+ if (p->master_vm == NULL)
-+ p->master_vm = pdd->vm;
- }
-
- return pdd;
-diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
-index db3ed48..fdf55d0 100644
---- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
-+++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
-@@ -238,7 +238,8 @@ struct kfd2kgd_calls {
-
- uint32_t (*get_max_engine_clock_in_mhz)(struct kgd_dev *kgd);
-
-- int (*create_process_vm)(struct kgd_dev *kgd, void **vm);
-+ int (*create_process_vm)(struct kgd_dev *kgd, void **vm,
-+ void *master_vm);
- void (*destroy_process_vm)(struct kgd_dev *kgd, void *vm);
-
- int (*create_process_gpumem)(struct kgd_dev *kgd, uint64_t va, size_t size, void *vm, struct kgd_mem **mem);
---
-2.7.4
-