aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMukul Joshi <mukul.joshi@amd.com>2024-04-23 14:40:37 -0400
committerAlex Deucher <alexander.deucher@amd.com>2024-04-30 21:22:50 -0400
commitf06446ef23216090d1ee8ede1a7d7ae430c22dcc (patch)
treeba1ae1a43c4325f411a3c10366df77327987eaae
parente67572cd2204894179d89bd7b984072f19313b03 (diff)
downloadlinux-f06446ef23216090d1ee8ede1a7d7ae430c22dcc.tar.gz
drm/amdgpu: Fix VRAM memory accounting
Subtract the VRAM pinned memory when checking for available memory in amdgpu_amdkfd_reserve_mem_limit function since that memory is not available for use. Signed-off-by: Mukul Joshi <mukul.joshi@amd.com> Reviewed-by: Felix Kuehling <felix.kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 2131de36e3dac..e4d4e55c08ad5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -220,7 +220,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 && xcp_id >= 0 && adev->kfd.vram_used[xcp_id] + vram_needed >
- vram_size - reserved_for_pt)) {
+ vram_size - reserved_for_pt - atomic64_read(&adev->vram_pin_size))) {
ret = -ENOMEM;
goto release;
}