diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3038-drm-amdgpu-fix-VM-faults-with-per-VM-BOs.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3038-drm-amdgpu-fix-VM-faults-with-per-VM-BOs.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3038-drm-amdgpu-fix-VM-faults-with-per-VM-BOs.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3038-drm-amdgpu-fix-VM-faults-with-per-VM-BOs.patch new file mode 100644 index 00000000..a495710c --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3038-drm-amdgpu-fix-VM-faults-with-per-VM-BOs.patch @@ -0,0 +1,53 @@ +From c8d5bc9e1c44189680957c559eeab9dda6d1f2e9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Fri, 22 Dec 2017 17:13:03 +0100 +Subject: [PATCH 3038/4131] drm/amdgpu: fix VM faults with per VM BOs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There was a small window between unreserve and second reserve where the +freshly allocated BO could have been evicted without the VM noticing it. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Chunming Zhou <david1.zhou@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index f11e1b0..7146d8b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -1776,8 +1776,26 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev, + INIT_LIST_HEAD(&bo_va->valids); + INIT_LIST_HEAD(&bo_va->invalids); + +- if (bo) +- list_add_tail(&bo_va->base.bo_list, &bo->va); ++ if (!bo) ++ return bo_va; ++ ++ list_add_tail(&bo_va->base.bo_list, &bo->va); ++ ++ if (bo->tbo.resv != vm->root.base.bo->tbo.resv) ++ return bo_va; ++ ++ if (bo->preferred_domains & ++ amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type)) ++ return bo_va; ++ ++ /* ++ * We checked all the prerequisites, but it looks like this per VM BO ++ * is currently evicted. add the BO to the evicted list to make sure it ++ * is validated on next VM use to avoid fault. ++ * */ ++ spin_lock(&vm->status_lock); ++ list_move_tail(&bo_va->base.vm_status, &vm->evicted); ++ spin_unlock(&vm->status_lock); + + return bo_va; + } +-- +2.7.4 + |