aboutsummaryrefslogtreecommitdiffstats
path: root/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0923-drm-amdgpu-fix-VM-sync-with-always-valid-BOs-v2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0923-drm-amdgpu-fix-VM-sync-with-always-valid-BOs-v2.patch')
-rw-r--r--meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0923-drm-amdgpu-fix-VM-sync-with-always-valid-BOs-v2.patch114
1 files changed, 0 insertions, 114 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0923-drm-amdgpu-fix-VM-sync-with-always-valid-BOs-v2.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0923-drm-amdgpu-fix-VM-sync-with-always-valid-BOs-v2.patch
deleted file mode 100644
index aae0bce7..00000000
--- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0923-drm-amdgpu-fix-VM-sync-with-always-valid-BOs-v2.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From d5c3d7d59aea4e67769717dfa799e14e294b09ef Mon Sep 17 00:00:00 2001
-From: Christian Koenig <christian.koenig@amd.com>
-Date: Fri, 8 Sep 2017 14:09:41 +0200
-Subject: [PATCH 0923/4131] drm/amdgpu: fix VM sync with always valid BOs v2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-All users of a VM must always wait for updates with always
-valid BOs to be completed.
-
-v2: remove debugging leftovers, rename struct member
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Roger He <Hongbo.He@amd.com>
-Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
-Signed-off-by: Kalyan Alle <kalyan.alle@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 10 ++++++----
- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 15 ++++++++++-----
- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +-
- 3 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-index 1794324..d8d75f9 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
-@@ -774,10 +774,6 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)
- if (r)
- return r;
-
-- r = amdgpu_sync_fence(adev, &p->job->sync, vm->last_dir_update);
-- if (r)
-- return r;
--
- r = amdgpu_vm_clear_freed(adev, vm, NULL);
- if (r)
- return r;
-@@ -832,6 +828,12 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)
- }
-
- r = amdgpu_vm_handle_moved(adev, vm, &p->job->sync);
-+ if (r)
-+ return r;
-+
-+ r = amdgpu_sync_fence(adev, &p->job->sync, vm->last_update);
-+ if (r)
-+ return r;
-
- if (amdgpu_vm_debug && p->bo_list) {
- /* Invalidate all BOs to test for userspace bugs */
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-index 0b62a33..3047fc1 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
-@@ -1141,9 +1141,8 @@ static int amdgpu_vm_update_level(struct amdgpu_device *adev,
- goto error_free;
-
- amdgpu_bo_fence(parent->base.bo, fence, true);
-- dma_fence_put(vm->last_dir_update);
-- vm->last_dir_update = dma_fence_get(fence);
-- dma_fence_put(fence);
-+ dma_fence_put(vm->last_update);
-+ vm->last_update = fence;
- }
- }
-
-@@ -1821,6 +1820,12 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev,
- trace_amdgpu_vm_bo_mapping(mapping);
- }
-
-+ if (bo_va->base.bo &&
-+ bo_va->base.bo->tbo.resv == vm->root.base.bo->tbo.resv) {
-+ dma_fence_put(vm->last_update);
-+ vm->last_update = dma_fence_get(bo_va->last_pt_update);
-+ }
-+
- return 0;
- }
-
-@@ -2604,7 +2609,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
- vm->use_cpu_for_update ? "CPU" : "SDMA");
- WARN_ONCE((vm->use_cpu_for_update & !amdgpu_vm_is_large_bar(adev)),
- "CPU update of VM recommended only for large BAR system\n");
-- vm->last_dir_update = NULL;
-+ vm->last_update = NULL;
-
- flags = AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS |
- AMDGPU_GEM_CREATE_VRAM_CLEARED;
-@@ -2712,7 +2717,7 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)
- }
-
- amdgpu_vm_free_levels(&vm->root);
-- dma_fence_put(vm->last_dir_update);
-+ dma_fence_put(vm->last_update);
- for (i = 0; i < AMDGPU_MAX_VMHUBS; i++)
- amdgpu_vm_free_reserved_vmid(adev, vm, i);
- }
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
-index 862b846..561dd19 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
-@@ -140,7 +140,7 @@ struct amdgpu_vm {
-
- /* contains the page directory */
- struct amdgpu_vm_pt root;
-- struct dma_fence *last_dir_update;
-+ struct dma_fence *last_update;
-
- /* protecting freed */
- spinlock_t freed_lock;
---
-2.7.4
-