aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/4147-drm-amdgpu-Fix-unbalanced-memory-accounting-in-error.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4147-drm-amdgpu-Fix-unbalanced-memory-accounting-in-error.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/4147-drm-amdgpu-Fix-unbalanced-memory-accounting-in-error.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4147-drm-amdgpu-Fix-unbalanced-memory-accounting-in-error.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4147-drm-amdgpu-Fix-unbalanced-memory-accounting-in-error.patch
new file mode 100644
index 00000000..9bac88e7
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4147-drm-amdgpu-Fix-unbalanced-memory-accounting-in-error.patch
@@ -0,0 +1,31 @@
+From e0c9c35342db9ece530982054a5541786c6c87f8 Mon Sep 17 00:00:00 2001
+From: Felix Kuehling <Felix.Kuehling@amd.com>
+Date: Mon, 19 Mar 2018 18:00:47 -0400
+Subject: [PATCH 4147/5725] drm/amdgpu: Fix unbalanced memory accounting in
+ error case
+
+When the userptr BO has already been created, unreffing the BO will
+unreserve the memory limit. Don't do it twice.
+
+Change-Id: Ibdcd972ef9177756d83b9bebf0244200e7099748
+Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+index 9061f44..b3112fb 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+@@ -1297,6 +1297,8 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(
+
+ allocate_init_user_pages_failed:
+ amdgpu_bo_unref(&bo);
++ /* Don't unreserve system mem limit twice */
++ goto err_reserve_limit;
+ err_bo_create:
+ if (!sg)
+ unreserve_system_mem_limit(adev, size, alloc_domain);
+--
+2.7.4
+