Commit 76006776 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amdgpu: fix the VM fault while write at the top of the invisible vram 



Raven2 has a HW issue that it is unable to use the vram which is out of
MC_VM_SYSTEM_APERTURE_HIGH_ADDR. So here is the workaround that increase system
aperture high address to get rid of the VM fault and hardware hang.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 28ab1229

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

+13 −2
Original line number Diff line number Diff line
@@ -73,6 +73,17 @@ 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);



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

		/*

		 * Raven2 has a HW issue that it is unable to use the vram which

		 * is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR. So here is the

		 * workaround that increase system aperture high address (add 1)

		 * 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, adev->gmc.agp_end) >> 18) + 0x1);

	else

		WREG32_SOC15(GC, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,

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

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

+13 −2
Original line number Diff line number Diff line
@@ -91,6 +91,17 @@ 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);



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

		/*

		 * Raven2 has a HW issue that it is unable to use the vram which

		 * is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR. So here is the

		 * workaround that increase system aperture high address (add 1)

		 * 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, adev->gmc.agp_end) >> 18) + 0x1);

	else

		WREG32_SOC15(MMHUB, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE