diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4198-drm-amdgpu-re-validate-per-VM-BOs-if-required-v2.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4198-drm-amdgpu-re-validate-per-VM-BOs-if-required-v2.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4198-drm-amdgpu-re-validate-per-VM-BOs-if-required-v2.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4198-drm-amdgpu-re-validate-per-VM-BOs-if-required-v2.patch new file mode 100644 index 00000000..41107e4e --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4198-drm-amdgpu-re-validate-per-VM-BOs-if-required-v2.patch @@ -0,0 +1,49 @@ +From e95027d2e5580dcff825de9ddb9d5697f051a4c4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Mon, 19 Mar 2018 11:49:14 +0100 +Subject: [PATCH 4198/5725] drm/amdgpu: re-validate per VM BOs if required v2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If a per VM BO ends up in a allowed domain it never moves back into the +prefered domain. + +v2: move the extra handling into amdgpu_vm_bo_update when we exit the + state machine. Make memory type handling generic. + +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 | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index 1a7d9aba..93f929a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -1585,7 +1585,20 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, + } + + spin_lock(&vm->status_lock); +- list_del_init(&bo_va->base.vm_status); ++ if (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv) { ++ unsigned mem_type = bo->tbo.mem.mem_type; ++ ++ /* If the BO is not in its preferred location add it back to ++ * the evicted list so that it gets validated again on the ++ * next command submission. ++ */ ++ if (!(bo->preferred_domains & amdgpu_mem_type_to_domain(mem_type))) ++ list_add_tail(&bo_va->base.vm_status, &vm->evicted); ++ else ++ list_del_init(&bo_va->base.vm_status); ++ } else { ++ list_del_init(&bo_va->base.vm_status); ++ } + spin_unlock(&vm->status_lock); + + list_splice_init(&bo_va->invalids, &bo_va->valids); +-- +2.7.4 + |