From 4774ffcd1a32522272556bc2d317af37c27d6268 Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Thu, 5 Jan 2017 16:36:09 -0500 Subject: [PATCH 1567/4131] drm/amdgpu: Fix userptr memory usage limit Change-Id: Id16f5ba11ba369089e393a07f6f1558a9270ecdf Signed-off-by: Felix Kuehling --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index 7c6f8ed..d14550d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -132,7 +132,7 @@ static int amdgpu_amdkfd_reserve_system_mem_limit(struct amdgpu_device *adev, } else if (domain == AMDGPU_GEM_DOMAIN_CPU) { if ((kfd_mem_limit.system_mem_used + acc_size > - kfd_mem_limit.max_system_mem_limit) && + kfd_mem_limit.max_system_mem_limit) || (kfd_mem_limit.userptr_mem_used + (size + acc_size) > kfd_mem_limit.max_userptr_mem_limit)) { ret = -ENOMEM; -- 2.7.4