aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0872-drm-amdgpu-fix-moved-list-handling-in-the-VM.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0872-drm-amdgpu-fix-moved-list-handling-in-the-VM.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0872-drm-amdgpu-fix-moved-list-handling-in-the-VM.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0872-drm-amdgpu-fix-moved-list-handling-in-the-VM.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0872-drm-amdgpu-fix-moved-list-handling-in-the-VM.patch
new file mode 100644
index 00000000..2158176a
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0872-drm-amdgpu-fix-moved-list-handling-in-the-VM.patch
@@ -0,0 +1,55 @@
+From f9b3f5bae976532f228924530e8a176ca62ebc0e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Fri, 1 Sep 2017 14:46:19 +0200
+Subject: [PATCH 0872/4131] drm/amdgpu: fix moved list handling in the VM
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Only move BOs to the moved/relocated list when they aren't already on a list.
+
+This prevents accidential removal from the evicted list.
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+index a4f12e5..0c1cbb9 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+@@ -1178,7 +1178,8 @@ static void amdgpu_vm_invalidate_level(struct amdgpu_vm *vm,
+
+ entry->addr = ~0ULL;
+ spin_lock(&vm->status_lock);
+- list_move(&entry->base.vm_status, &vm->relocated);
++ if (list_empty(&entry->base.vm_status))
++ list_add(&entry->base.vm_status, &vm->relocated);
+ spin_unlock(&vm->status_lock);
+ amdgpu_vm_invalidate_level(vm, entry);
+ }
+@@ -2108,7 +2109,8 @@ static void amdgpu_vm_bo_insert_map(struct amdgpu_device *adev,
+
+ if (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv) {
+ spin_lock(&vm->status_lock);
+- list_move(&bo_va->base.vm_status, &vm->moved);
++ if (list_empty(&bo_va->base.vm_status))
++ list_add(&bo_va->base.vm_status, &vm->moved);
+ spin_unlock(&vm->status_lock);
+ }
+ trace_amdgpu_vm_bo_map(bo_va, mapping);
+@@ -2463,7 +2465,8 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev,
+ }
+
+ spin_lock(&bo_base->vm->status_lock);
+- list_move(&bo_base->vm_status, &bo_base->vm->moved);
++ if (list_empty(&bo_base->vm_status))
++ list_add(&bo_base->vm_status, &vm->moved);
+ spin_unlock(&bo_base->vm->status_lock);
+ }
+ }
+--
+2.7.4
+