Commit 5581c670 authored by shaoyunl's avatar shaoyunl Committed by Alex Deucher
Browse files

drm/amdgpu: set system aperture to cover whole FB region 



In XGMI configuration, the FB region covers vram region from peer
device, adjust system aperture to cover all of them

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarshaoyunl <shaoyun.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 73b6f96c

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

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev) 


	/* Program the system aperture low logical page number. */

	WREG32_SOC15(GC, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,

		     min(adev->gmc.vram_start, adev->gmc.agp_start) >> 18);

		     min(adev->gmc.fb_start, adev->gmc.agp_start) >> 18);



	if (adev->asic_type == CHIP_RAVEN && adev->rev_id >= 0x8)

		/*
@@ -82,11 +82,11 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev) 
		 * to get rid of the VM fault and hardware hang.

		 */

		WREG32_SOC15(GC, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,

			     max((adev->gmc.vram_end >> 18) + 0x1,

			     max((adev->gmc.fb_end >> 18) + 0x1,

				 adev->gmc.agp_end >> 18));

	else

		WREG32_SOC15(GC, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,

			     max(adev->gmc.vram_end, adev->gmc.agp_end) >> 18);

			     max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);



	/* Set default page address. */

	value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start

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

+3 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static void mmhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev) 


	/* Program the system aperture low logical page number. */

	WREG32_SOC15(MMHUB, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,

		     min(adev->gmc.vram_start, adev->gmc.agp_start) >> 18);

		     min(adev->gmc.fb_start, adev->gmc.agp_start) >> 18);



	if (adev->asic_type == CHIP_RAVEN && adev->rev_id >= 0x8)

		/*
@@ -100,11 +100,11 @@ static void mmhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev) 
		 * to get rid of the VM fault and hardware hang.

		 */

		WREG32_SOC15(MMHUB, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,

			     max((adev->gmc.vram_end >> 18) + 0x1,

			     max((adev->gmc.fb_end >> 18) + 0x1,

				 adev->gmc.agp_end >> 18));

	else

		WREG32_SOC15(MMHUB, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,

			     max(adev->gmc.vram_end, adev->gmc.agp_end) >> 18);

			     max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);



	/* Set default page address. */

	value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start +

CRA Git | Maintained and supported by SUSTech CRA and CCSE