diff options
| author | Christian König <christian.koenig@amd.com> | 2020-11-02 13:01:53 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2020-11-04 11:22:46 +0100 |
| commit | 586052b0a6062e2fa98189d7f24d8cb9ccf4258b (patch) | |
| tree | f5a670bbb0fe611e3b8aeebfb8efc7292e37adc7 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | d74252bb8f0e38194e7457f7b4e5a8a33514bc24 (diff) | |
| download | linux-stable-586052b0a6062e2fa98189d7f24d8cb9ccf4258b.tar.gz linux-stable-586052b0a6062e2fa98189d7f24d8cb9ccf4258b.tar.bz2 linux-stable-586052b0a6062e2fa98189d7f24d8cb9ccf4258b.zip | |
drm/ttm: rework no_retry handling v2
During eviction we do want to trigger the OOM killer.
Only while doing new allocations we should try to avoid that and
return -ENOMEM to the application.
v2: rename the flag to gfp_retry_mayfail.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/398685/
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 1aa516429c80..4e9dfbea31c6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -516,6 +516,8 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, struct ttm_operation_ctx ctx = { .interruptible = (bp->type != ttm_bo_type_kernel), .no_wait_gpu = bp->no_wait_gpu, + /* We opt to avoid OOM on system pages allocations */ + .gfp_retry_mayfail = true, .resv = bp->resv, .flags = bp->type != ttm_bo_type_kernel ? TTM_OPT_FLAG_ALLOW_RES_EVICT : 0 |