Re: 答复: [PATCH] amd/amdgpu: seperate sriov fb aperture setting
Koenig, Christian
Christian.Koenig at amd.com
Tue Aug 20 14:54:24 UTC 2019
Hi Frank,
please separate that change in a single patch.
Adding all the SRIOV dependencies to the fb programming code is a clear
NAK from my side. We should rather adjust the agp_start and agp_end
addresses instead.
Regards,
Christian.
Am 20.08.19 um 08:17 schrieb Min, Frank:
> Hi Alex/Christian,
> I have update the previous patch. Would you please help to review it?
> Here is the updated part compared with last patch
>
> The change here is to adapt vega10 sriov need to use the mc base from 0, instead of read the config from mmhub.
>
> - if (!amdgpu_sriov_vf(adev)) {
> - if (adev->asic_type == CHIP_ARCTURUS)
> - base = mmhub_v9_4_get_fb_location(adev);
> - else
> - base = mmhub_v1_0_get_fb_location(adev);
> - }
> +
> + if (adev->asic_type == CHIP_ARCTURUS)
> + base = mmhub_v9_4_get_fb_location(adev);
> + else if (!amdgpu_sriov_vf(adev))
> + base = mmhub_v1_0_get_fb_location(adev);
> +
>
> -----邮件原件-----
> 发件人: Frank.Min <Frank.Min at amd.com>
> 发送时间: 2019年8月20日 14:13
> 收件人: amd-gfx at lists.freedesktop.org
> 抄送: Min, Frank <Frank.Min at amd.com>
> 主题: [PATCH] amd/amdgpu: seperate sriov fb aperture setting
>
> sriov would not use agp, so seperate the fb aperture setting.
>
> Change-Id: I1372cd355326731a31361bff13d79e12121b8651
> Signed-off-by: Frank.Min <Frank.Min at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 39 ++++++++++++++++++++------------
> drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 12 +++++-----
> drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 27 +++++++++++++++-------
> 3 files changed, 49 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
> index 6ce37ce..ec78c8b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
> @@ -75,23 +75,32 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)
> WREG32_SOC15_RLC(GC, 0, mmMC_VM_AGP_BOT, adev->gmc.agp_start >> 24);
> WREG32_SOC15_RLC(GC, 0, mmMC_VM_AGP_TOP, adev->gmc.agp_end >> 24);
>
> - /* Program the system aperture low logical page number. */
> - WREG32_SOC15_RLC(GC, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,
> - min(adev->gmc.fb_start, adev->gmc.agp_start) >> 18);
> + if (amdgpu_sriov_vf(adev)) {
> + /* Program the system aperture low logical page number. */
> + WREG32_SOC15_RLC(GC, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,
> + adev->gmc.fb_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_RLC(GC, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,
> - max((adev->gmc.fb_end >> 18) + 0x1,
> - adev->gmc.agp_end >> 18));
> - else
> - WREG32_SOC15_RLC(GC, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,
> - max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);
> + adev->gmc.fb_end >> 18);
> + } else {
> + /* Program the system aperture low logical page number. */
> + WREG32_SOC15_RLC(GC, 0, mmMC_VM_SYSTEM_APERTURE_LOW_ADDR,
> + min(adev->gmc.fb_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_RLC(GC, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,
> + max((adev->gmc.fb_end >> 18) + 0x1,
> + adev->gmc.agp_end >> 18));
> + else
> + WREG32_SOC15_RLC(GC, 0, mmMC_VM_SYSTEM_APERTURE_HIGH_ADDR,
> + max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);
> + }
>
> /* Set default page address. */
> value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index 6de1726..683f47d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -920,12 +920,12 @@ static void gmc_v9_0_vram_gtt_location(struct amdgpu_device *adev,
> struct amdgpu_gmc *mc)
> {
> u64 base = 0;
> - if (!amdgpu_sriov_vf(adev)) {
> - if (adev->asic_type == CHIP_ARCTURUS)
> - base = mmhub_v9_4_get_fb_location(adev);
> - else
> - base = mmhub_v1_0_get_fb_location(adev);
> - }
> +
> + if (adev->asic_type == CHIP_ARCTURUS)
> + base = mmhub_v9_4_get_fb_location(adev);
> + else if (!amdgpu_sriov_vf(adev))
> + base = mmhub_v1_0_get_fb_location(adev);
> +
> /* add the xgmi offset of the physical node */
> base += adev->gmc.xgmi.physical_node_id * adev->gmc.xgmi.node_segment_size;
> amdgpu_gmc_vram_location(adev, mc, base); diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> index 0cf7ef4..ea3359f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> @@ -118,14 +118,25 @@ static void mmhub_v9_4_init_system_aperture_regs(struct amdgpu_device *adev,
> adev->gmc.agp_start >> 24);
>
> /* Program the system aperture low logical page number. */
> - WREG32_SOC15_OFFSET(MMHUB, 0,
> - mmVMSHAREDVC0_MC_VM_SYSTEM_APERTURE_LOW_ADDR,
> - hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
> - min(adev->gmc.fb_start, adev->gmc.agp_start) >> 18);
> - WREG32_SOC15_OFFSET(MMHUB, 0,
> - mmVMSHAREDVC0_MC_VM_SYSTEM_APERTURE_HIGH_ADDR,
> - hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
> - max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);
> + if (amdgpu_sriov_vf(adev)) {
> + WREG32_SOC15_OFFSET(MMHUB, 0,
> + mmVMSHAREDVC0_MC_VM_SYSTEM_APERTURE_LOW_ADDR,
> + hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
> + adev->gmc.fb_start >> 18);
> + WREG32_SOC15_OFFSET(MMHUB, 0,
> + mmVMSHAREDVC0_MC_VM_SYSTEM_APERTURE_HIGH_ADDR,
> + hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
> + adev->gmc.fb_end >> 18);
> + } else {
> + WREG32_SOC15_OFFSET(MMHUB, 0,
> + mmVMSHAREDVC0_MC_VM_SYSTEM_APERTURE_LOW_ADDR,
> + hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
> + min(adev->gmc.fb_start, adev->gmc.agp_start) >> 18);
> + WREG32_SOC15_OFFSET(MMHUB, 0,
> + mmVMSHAREDVC0_MC_VM_SYSTEM_APERTURE_HIGH_ADDR,
> + hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
> + max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);
> + }
>
> /* Set default page address. */
> value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start +
> --
> 2.7.4
>
More information about the amd-gfx
mailing list