Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24562523 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Alex Deucher
Browse files

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: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarRoger He <Hongbo.He@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 97931119

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+5 −3
Original line number Diff line number Diff line
@@ -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) {