diff options
| author | Andrey Grodzovsky | 2017-12-15 18:09:16 +0100 |
|---|---|---|
| committer | Alex Deucher | 2017-12-18 17:53:24 +0100 |
| commit | 24562523688bebc7ec17a88271b4e8c3fc337b74 (patch) | |
| tree | 6870c7c1b5637960e8e9f26eb4f4607580554397 /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |
| parent | MAINTAINERS: add separate entry for DRM TTM v2 (diff) | |
| download | kernel-qcow2-linux-24562523688bebc7ec17a88271b4e8c3fc337b74.tar.gz kernel-qcow2-linux-24562523688bebc7ec17a88271b4e8c3fc337b74.tar.xz kernel-qcow2-linux-24562523688bebc7ec17a88271b4e8c3fc337b74.zip | |
Revert "drm/amd/amdgpu: set gtt size according to system memory size only"
This reverts commit ba851eed895c76be0eb4260bdbeb7e26f9ccfaa2.
With that change piglit max size tests (running with -t max.*size) are causing
OOM and hard hang on my CZ with 1GB RAM.
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Roger He <Hongbo.He@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 5b5554cba35f..f1b7d987bd57 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1424,9 +1424,11 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) struct sysinfo si; si_meminfo(&si); - gtt_size = max(AMDGPU_DEFAULT_GTT_SIZE_MB << 20, - (uint64_t)si.totalram * si.mem_unit * 3/4); - } else + gtt_size = min(max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20), + adev->mc.mc_vram_size), + ((uint64_t)si.totalram * si.mem_unit * 3/4)); + } + else gtt_size = (uint64_t)amdgpu_gtt_size << 20; r = ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_TT, gtt_size >> PAGE_SHIFT); if (r) { |