Commit 16783d8e authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: apply the RV2 system aperture fix to RN/CZN as well 



These chips needs the same fix.  This was previously not seen
on then since the AGP aperture expanded the system aperture,
but this showed up again when AGP was disabled.

Reviewed-and-tested-by: default avatarJiadong Zhu <Jiadong.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d65e0e91

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

+3 −1
Original line number Diff line number Diff line
@@ -102,7 +102,9 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev) 
		WREG32_SOC15_RLC(GC, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,

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



		if (adev->apu_flags & AMD_APU_IS_RAVEN2)

		if (adev->apu_flags & (AMD_APU_IS_RAVEN2 |

				       AMD_APU_IS_RENOIR |

				       AMD_APU_IS_GREEN_SARDINE))

		       /*

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

			* vram which is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR.

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

+3 −1
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@ gfxhub_v1_2_xcc_init_system_aperture_regs(struct amdgpu_device *adev, 
			WREG32_SOC15_RLC(GC, GET_INST(GC, i), regMC_VM_SYSTEM_APERTURE_LOW_ADDR,

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



			if (adev->apu_flags & AMD_APU_IS_RAVEN2)

			if (adev->apu_flags & (AMD_APU_IS_RAVEN2 |

					       AMD_APU_IS_RENOIR |

					       AMD_APU_IS_GREEN_SARDINE))

			       /*

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

				* vram which is out of MC_VM_SYSTEM_APERTURE_HIGH_ADDR.

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

+3 −1
Original line number Diff line number Diff line
@@ -96,7 +96,9 @@ static void mmhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev) 
	WREG32_SOC15(MMHUB, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,

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



	if (adev->apu_flags & AMD_APU_IS_RAVEN2)

	if (adev->apu_flags & (AMD_APU_IS_RAVEN2 |

			       AMD_APU_IS_RENOIR |

			       AMD_APU_IS_GREEN_SARDINE))

		/*

		 * 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

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+6 −2
Original line number Diff line number Diff line
@@ -1294,7 +1294,9 @@ static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_ 
	/* AGP aperture is disabled */

	if (agp_bot > agp_top) {

		logical_addr_low = adev->gmc.fb_start >> 18;

		if (adev->apu_flags & AMD_APU_IS_RAVEN2)

		if (adev->apu_flags & (AMD_APU_IS_RAVEN2 |

				       AMD_APU_IS_RENOIR |

				       AMD_APU_IS_GREEN_SARDINE))

			/*

			 * 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
@@ -1306,7 +1308,9 @@ static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_ 
			logical_addr_high = adev->gmc.fb_end >> 18;

	} else {

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

		if (adev->apu_flags & AMD_APU_IS_RAVEN2)

		if (adev->apu_flags & (AMD_APU_IS_RAVEN2 |

				       AMD_APU_IS_RENOIR |

				       AMD_APU_IS_GREEN_SARDINE))

			/*

			 * 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