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

Commit bfa8eea2 authored by Flora Cui's avatar Flora Cui Committed by Alex Deucher
Browse files

drm/amdgpu: init gfx9 aperture settings 



fix settings.

Signed-off-by: default avatarFlora Cui <Flora.Cui@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6197ae28

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

+4 −1
Original line number Diff line number Diff line
@@ -1617,7 +1617,10 @@ static void gfx_v9_0_gpu_init(struct amdgpu_device *adev) 
			tmp = REG_SET_FIELD(0, SH_MEM_CONFIG, ALIGNMENT_MODE,

					    SH_MEM_ALIGNMENT_MODE_UNALIGNED);

			WREG32_SOC15(GC, 0, mmSH_MEM_CONFIG, tmp);

			tmp = adev->gmc.shared_aperture_start >> 48;

			tmp = REG_SET_FIELD(0, SH_MEM_BASES, PRIVATE_BASE,

				(adev->gmc.private_aperture_start >> 48));

			tmp = REG_SET_FIELD(tmp, SH_MEM_BASES, SHARED_BASE,

				(adev->gmc.shared_aperture_start >> 48));

			WREG32_SOC15(GC, 0, mmSH_MEM_BASES, tmp);

		}

	}

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

+1 −2
Original line number Diff line number Diff line
@@ -562,8 +562,7 @@ static int gmc_v9_0_early_init(void *handle) 
	adev->gmc.shared_aperture_start = 0x2000000000000000ULL;

	adev->gmc.shared_aperture_end =

		adev->gmc.shared_aperture_start + (4ULL << 30) - 1;

	adev->gmc.private_aperture_start =

		adev->gmc.shared_aperture_end + 1;

	adev->gmc.private_aperture_start = 0x1000000000000000ULL;

	adev->gmc.private_aperture_end =

		adev->gmc.private_aperture_start + (4ULL << 30) - 1;