diff options
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0942-drm-amdgpu-fix-amdgpu_vm_handle_moved-as-well-v2.patch')
| -rw-r--r-- | meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0942-drm-amdgpu-fix-amdgpu_vm_handle_moved-as-well-v2.patch | 134 |
1 files changed, 0 insertions, 134 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0942-drm-amdgpu-fix-amdgpu_vm_handle_moved-as-well-v2.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0942-drm-amdgpu-fix-amdgpu_vm_handle_moved-as-well-v2.patch deleted file mode 100644 index dffb8146..00000000 --- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0942-drm-amdgpu-fix-amdgpu_vm_handle_moved-as-well-v2.patch +++ /dev/null @@ -1,134 +0,0 @@ -From ac98247efd3fda5206ac1b1d35e8c52859fe39bb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> -Date: Mon, 11 Sep 2017 16:54:59 +0200 -Subject: [PATCH 0942/4131] drm/amdgpu: fix amdgpu_vm_handle_moved as well v2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There is no guarantee that the last BO_VA actually needed an update. - -Additional to that all command submissions must wait for moved BOs to -be cleared, not just the first one. - -v2: Don't overwrite any newer fence. - -Signed-off-by: Christian König <christian.koenig@amd.com> -Reviewed-by: Chunming Zhou <david1.zhou@amd.com> - - Conflicts: - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c - -Change-Id: Ie4d0dac9ac45c29e14cb610bda7fd84815d68596 ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 24 ++++++++++-------------- - drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 +-- - 3 files changed, 12 insertions(+), 17 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -index d8d75f9..98ba5e2 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c -@@ -827,7 +827,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p) - - } - -- r = amdgpu_vm_handle_moved(adev, vm, &p->job->sync); -+ r = amdgpu_vm_handle_moved(adev, vm); - if (r) - return r; - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -index 3047fc1..7f4f721 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c -@@ -1758,7 +1758,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, - dma_addr_t *pages_addr = NULL; - struct ttm_mem_reg *mem; - struct drm_mm_node *nodes; -- struct dma_fence *exclusive; -+ struct dma_fence *exclusive, **last_update; - uint64_t flags; - int r; - -@@ -1786,6 +1786,11 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, - else - flags = 0x0; - -+ if (clear || (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv)) -+ last_update = &vm->last_update; -+ else -+ last_update = &bo_va->last_pt_update; -+ - if (!clear && bo_va->base.moved) { - bo_va->base.moved = false; - list_splice_init(&bo_va->valids, &bo_va->invalids); -@@ -1797,7 +1802,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, - list_for_each_entry(mapping, &bo_va->invalids, list) { - r = amdgpu_vm_bo_split_mapping(adev, exclusive, pages_addr, vm, - mapping, flags, mem, -- &bo_va->last_pt_update); -+ last_update); - if (r) - return r; - } -@@ -1820,12 +1825,6 @@ 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; - } - -@@ -2023,15 +2022,15 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev, - * PTs have to be reserved! - */ - int amdgpu_vm_handle_moved(struct amdgpu_device *adev, -- struct amdgpu_vm *vm, -- struct amdgpu_sync *sync) -+ struct amdgpu_vm *vm) - { -- struct amdgpu_bo_va *bo_va = NULL; - bool clear; - int r = 0; - - spin_lock(&vm->status_lock); - while (!list_empty(&vm->moved)) { -+ struct amdgpu_bo_va *bo_va; -+ - bo_va = list_first_entry(&vm->moved, - struct amdgpu_bo_va, base.vm_status); - spin_unlock(&vm->status_lock); -@@ -2047,9 +2046,6 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev, - } - spin_unlock(&vm->status_lock); - -- if (bo_va) -- r = amdgpu_sync_fence(adev, sync, bo_va->last_pt_update); -- - return r; - } - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h -index 561dd19..28cf20b 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h -@@ -250,8 +250,7 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev, - struct amdgpu_vm *vm, - struct dma_fence **fence); - int amdgpu_vm_handle_moved(struct amdgpu_device *adev, -- struct amdgpu_vm *vm, -- struct amdgpu_sync *sync); -+ struct amdgpu_vm *vm); - int amdgpu_vm_bo_update(struct amdgpu_device *adev, - struct amdgpu_bo_va *bo_va, - bool clear); --- -2.7.4 - |