diff options
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1591-drm-amdkfd-Fix-a-small-bug-that-a-variable-may-be-po.patch')
| -rw-r--r-- | meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1591-drm-amdkfd-Fix-a-small-bug-that-a-variable-may-be-po.patch | 124 |
1 files changed, 0 insertions, 124 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1591-drm-amdkfd-Fix-a-small-bug-that-a-variable-may-be-po.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1591-drm-amdkfd-Fix-a-small-bug-that-a-variable-may-be-po.patch deleted file mode 100644 index 7a8018d8..00000000 --- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/1591-drm-amdkfd-Fix-a-small-bug-that-a-variable-may-be-po.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 27a5f1ee886a62554a57c71b1c7c9572e65182fb Mon Sep 17 00:00:00 2001 -From: Yong Zhao <yong.zhao@amd.com> -Date: Fri, 16 Dec 2016 17:18:36 -0500 -Subject: [PATCH 1591/4131] drm/amdkfd: Fix a small bug that a variable may be - polluted - -ctx.duplicates in the code should not be used as the parameter of -ttm_eu_reserve_buffers(), because it may be polluted, but it should -not, as it will be used later in the code. - -Error messages are also updated to make debugging easier. - -Change-Id: I340a7f33b4401603c717c1d18130ef7b00289ac0 -Signed-off-by: Yong Zhao <yong.zhao@amd.com> - - Conflicts: - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 26 ++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c -index c27abc7..3f2bc2f 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c -@@ -2069,10 +2069,13 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *m_vm) - struct amdgpu_device *adev; - struct amdgpu_vm_parser param; - int ret = 0, i; -+ struct list_head duplicate_save; - - if (WARN_ON(master_vm == NULL || master_vm->master != master_vm)) - return -EINVAL; - -+ INIT_LIST_HEAD(&duplicate_save); -+ - INIT_LIST_HEAD(&ctx.list); - INIT_LIST_HEAD(&ctx.duplicates); - -@@ -2095,7 +2098,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *m_vm) - goto evict_fence_fail; - } - -- /* Get PD BO list and PT BO list from all the VMs */ -+ /* Get PD BO list from the VM */ - amdgpu_vm_get_pd_bo(&master_vm->base, &ctx.list, - &pd_bo_list[0]); - -@@ -2115,26 +2118,33 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *m_vm) - mutex_lock(&master_vm->lock); - list_splice_init(&ctx.list, &master_vm->kfd_bo_list); - ret = ttm_eu_reserve_buffers(&ctx.ticket, &master_vm->kfd_bo_list, -- false, &ctx.duplicates); -+ false, &duplicate_save); - if (ret) { - pr_debug("Memory eviction: TTM Reserve Failed. Try again\n"); - goto ttm_reserve_fail; - } - -+ /* Ensure kfd_bo_list does not change after ttm_eu_reserve_buffers(), -+ * so that the following list operation such as list_cut_position() -+ * can work as expected. -+ */ -+ if (!list_empty(&duplicate_save)) -+ pr_err("BUG: list of BOs to reserve has duplicates!\n"); -+ - /* Restore kfd_bo_list. ctx.list contains only PDs */ - list_cut_position(&ctx.list, &master_vm->kfd_bo_list, - &last_pd_bo_entry->tv.head); - - amdgpu_sync_create(&ctx.sync); - -- /* Validate PDs and PTs */ -+ /* Validate PDs*/ - list_for_each_entry(entry, &ctx.list, tv.head) { - struct amdgpu_bo *bo = entry->robj; - - ret = amdgpu_amdkfd_bo_validate(bo, bo->prefered_domains, - false); - if (ret) { -- pr_debug("Memory eviction: Validate failed. Try again\n"); -+ pr_debug("Memory eviction: Validate PD failed. Try again\n"); - goto validate_map_fail; - } - } -@@ -2147,7 +2157,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *m_vm) - ret = amdgpu_amdkfd_bo_validate(bo, bo->prefered_domains, - false); - if (ret) { -- pr_debug("Memory eviction: Validate failed. Try again\n"); -+ pr_debug("Memory eviction: Validate PTs failed. Try again\n"); - goto validate_map_fail; - } - } -@@ -2174,7 +2184,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *m_vm) - atomic64_read(&adev->num_evictions); - } - -- /* Wait for PT/PD validate to finish and attach eviction fence. -+ /* Wait for PD/PTs validate to finish and attach eviction fence. - * PD/PT share the same reservation object - */ - list_for_each_entry(entry, &ctx.list, tv.head) { -@@ -2194,7 +2204,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *m_vm) - - ret = amdgpu_amdkfd_bo_validate(bo, domain, false); - if (ret) { -- pr_debug("Memory eviction: Validate failed. Try again\n"); -+ pr_debug("Memory eviction: Validate BOs failed. Try again\n"); - goto validate_map_fail; - } - -@@ -2205,7 +2215,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *m_vm) - bo_va_entry, - &ctx.sync); - if (ret) { -- pr_debug("Memory eviction: Map failed. Try again\n"); -+ pr_debug("Memory eviction: update PTE failed. Try again\n"); - goto validate_map_fail; - } - } --- -2.7.4 - |