From f04fef741336366f19fca2e3580c2cbf4f88b0e3 Mon Sep 17 00:00:00 2001

From: Eric Huang <jinhuieric.huang@amd.com>

Date: Mon, 14 Nov 2022 11:43:48 -0500

Subject: drm/amdkfd: Fix a memory limit issue

Git-commit: 6f9eea4392a178af19360694b1db64f985d0b459

Patch-mainline: v6.1-rc6

References: jsc#PED-1166 jsc#PED-1168 jsc#PED-1170 jsc#PED-1218 jsc#PED-1220 jsc#PED-1222 jsc#PED-1223 jsc#PED-1225 jsc#PED-2849

It is to resolve a regression, which fails to allocate

VRAM due to no free memory in application, the reason

is we add check of vram_pin_size for memory limit, and

application is pinning the memory for Peerdirect, KFD

should not count it in memory limit. So removing

vram_pin_size will resolve it.

Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Acked-by: Patrik Jakobsson <pjakobsson@suse.de>

---

 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 +---

 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c

index 84f44f7e4111..6d1ff7b9258d 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c

@@ -171,9 +171,7 @@ int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev,

 	    (kfd_mem_limit.ttm_mem_used + ttm_mem_needed >

 	     kfd_mem_limit.max_ttm_mem_limit) ||

 	    (adev && adev->kfd.vram_used + vram_needed >

-	     adev->gmc.real_vram_size -

-	     atomic64_read(&adev->vram_pin_size) -

-	     reserved_for_pt)) {

+	     adev->gmc.real_vram_size - reserved_for_pt)) {

 		ret = -ENOMEM;

 		goto release;

 	}

-- 

2.38.1