summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wang <kevin1.wang@amd.com>2019-12-03 19:37:50 +0800
committerKevin Wang <kevin1.wang@amd.com>2019-12-03 20:12:28 +0800
commit486f55ea84033daf08a876c5e59a2d1d0c3ccb73 (patch)
treeca002c2fc02ea4fd02526bc8dbb93bc80ece98e1
parentd6af20db230c1b1e51d3b679c6511da336a774ab (diff)
Revert "drm/amdgpu: Set GTT size to be bigger than 3/4 of RAM"amd-19.30
This reverts commit fe775461ea80feed0ac2be7deb4ad1a6427002a6. Change-Id: I0f5f3f3de2da30ce518cb1327ca667c72a483229 Signed-off-by: Kevin Wang <kevin1.wang@amd.com> Acked-by: Feifei Xu <feifei.xu@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index fcef4a5cae83..986c7f7d0732 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1914,10 +1914,11 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
struct sysinfo si;
si_meminfo(&si);
- gtt_size = max3((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),
- adev->gmc.mc_vram_size,
- ((uint64_t)si.totalram * si.mem_unit));
- } else
+ gtt_size = min(max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),
+ adev->gmc.mc_vram_size),
+ ((uint64_t)si.totalram * si.mem_unit * 3/4));
+ }
+ else
gtt_size = (uint64_t)amdgpu_gtt_size << 20;
/* reserve for DGMA import domain */