Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: increase gtt size to 3GB by default v2

v2: address Alex's comment, add AMDGPU_DEFAULT_GTT_SIZE_MB.

Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Chunming Zhou and committed by
Alex Deucher
55ed8caf 5a0f3b5f

+9 -4
+1
drivers/gpu/drm/amd/amdgpu/amdgpu.h
··· 110 110 extern int amdgpu_cntl_sb_buf_per_se; 111 111 extern int amdgpu_param_buf_per_se; 112 112 113 + #define AMDGPU_DEFAULT_GTT_SIZE_MB 3072ULL /* 3GB by default */ 113 114 #define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000 114 115 #define AMDGPU_MAX_USEC_TIMEOUT 100000 /* 100 ms */ 115 116 #define AMDGPU_FENCE_JIFFIES_TIMEOUT (HZ / 2)
+2 -1
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
··· 346 346 * size equal to the 1024 or vram, whichever is larger. 347 347 */ 348 348 if (amdgpu_gart_size == -1) 349 - adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size); 349 + adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20), 350 + adev->mc.mc_vram_size); 350 351 else 351 352 adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20; 352 353
+2 -1
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
··· 395 395 * size equal to the 1024 or vram, whichever is larger. 396 396 */ 397 397 if (amdgpu_gart_size == -1) 398 - adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size); 398 + adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20), 399 + adev->mc.mc_vram_size); 399 400 else 400 401 adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20; 401 402
+2 -1
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
··· 557 557 * size equal to the 1024 or vram, whichever is larger. 558 558 */ 559 559 if (amdgpu_gart_size == -1) 560 - adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size); 560 + adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20), 561 + adev->mc.mc_vram_size); 561 562 else 562 563 adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20; 563 564
+2 -1
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
··· 486 486 * size equal to the 1024 or vram, whichever is larger. 487 487 */ 488 488 if (amdgpu_gart_size == -1) 489 - adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size); 489 + adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20), 490 + adev->mc.mc_vram_size); 490 491 else 491 492 adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20; 492 493