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

Commit 55ed8caf authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

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



v2: address Alex's comment, add AMDGPU_DEFAULT_GTT_SIZE_MB.

Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5a0f3b5f

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ extern int amdgpu_pos_buf_per_se; 
extern int amdgpu_cntl_sb_buf_per_se;

extern int amdgpu_param_buf_per_se;



#define AMDGPU_DEFAULT_GTT_SIZE_MB		3072ULL /* 3GB by default */

#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS	        3000

#define AMDGPU_MAX_USEC_TIMEOUT			100000	/* 100 ms */

#define AMDGPU_FENCE_JIFFIES_TIMEOUT		(HZ / 2)

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

+2 −1
Original line number Diff line number Diff line
@@ -346,7 +346,8 @@ static int gmc_v6_0_mc_init(struct amdgpu_device *adev) 
	 * size equal to the 1024 or vram, whichever is larger.

	 */

	if (amdgpu_gart_size == -1)

		adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size);

		adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),

					adev->mc.mc_vram_size);

	else

		adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20;

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

+2 −1
Original line number Diff line number Diff line
@@ -395,7 +395,8 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) 
	 * size equal to the 1024 or vram, whichever is larger.

	 */

	if (amdgpu_gart_size == -1)

		adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size);

		adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),

					adev->mc.mc_vram_size);

	else

		adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20;

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

+2 −1
Original line number Diff line number Diff line
@@ -557,7 +557,8 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev) 
	 * size equal to the 1024 or vram, whichever is larger.

	 */

	if (amdgpu_gart_size == -1)

		adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size);

		adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),

					adev->mc.mc_vram_size);

	else

		adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20;

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

+2 −1
Original line number Diff line number Diff line
@@ -486,7 +486,8 @@ static int gmc_v9_0_mc_init(struct amdgpu_device *adev) 
	 * size equal to the 1024 or vram, whichever is larger.

	 */

	if (amdgpu_gart_size == -1)

		adev->mc.gtt_size = max((1024ULL << 20), adev->mc.mc_vram_size);

		adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),

					adev->mc.mc_vram_size);

	else

		adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20;