aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2019-05-10 10:09:48 -0400
committerAlex Deucher <alexander.deucher@amd.com>2019-06-11 12:52:19 -0400
commit55c2e5a1600cfa9bb7afb445318d6ba1730251a5 (patch)
tree4c99118d5416a5e92800c5500ed0c1a9ce9d3fed /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
parent94de7349f78d1c598c852eef07c9f3097bad84f9 (diff)
drm/amdgpu: stop removing BOs from the LRU v3
This avoids OOM situations when we have lots of threads submitting at the same time. v3: apply this to the whole driver, not just CS Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Chunming Zhou <david1.zhou@amd.com> Tested-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index d513a5ad03dd..ed25a4e14404 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -171,7 +171,7 @@ void amdgpu_gem_object_close(struct drm_gem_object *obj,
171 171
172 amdgpu_vm_get_pd_bo(vm, &list, &vm_pd); 172 amdgpu_vm_get_pd_bo(vm, &list, &vm_pd);
173 173
174 r = ttm_eu_reserve_buffers(&ticket, &list, false, &duplicates, true); 174 r = ttm_eu_reserve_buffers(&ticket, &list, false, &duplicates, false);
175 if (r) { 175 if (r) {
176 dev_err(adev->dev, "leaking bo va because " 176 dev_err(adev->dev, "leaking bo va because "
177 "we fail to reserve bo (%d)\n", r); 177 "we fail to reserve bo (%d)\n", r);
@@ -608,7 +608,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
608 608
609 amdgpu_vm_get_pd_bo(&fpriv->vm, &list, &vm_pd); 609 amdgpu_vm_get_pd_bo(&fpriv->vm, &list, &vm_pd);
610 610
611 r = ttm_eu_reserve_buffers(&ticket, &list, true, &duplicates, true); 611 r = ttm_eu_reserve_buffers(&ticket, &list, true, &duplicates, false);
612 if (r) 612 if (r)
613 goto error_unref; 613 goto error_unref;
614 614