drm/amd/amdgpu: L1 Policy(1/5) - removed VM settings for mmhub and gfxhub from VF

Signed-off-by: Zhigang Luo <zhigang.luo@amd.com>
Signed-off-by: Jane Jian <jane.jian@amd.com>
Reviewed-by: Emily Deng <Emily.Deng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 68f9a1fa6dc1f3b70075db4ec377ee11439d90d2..4f72626fbce9cd694f26bf835e35730fdf37aeae 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1308,11 +1308,12 @@ static int gmc_v9_0_hw_init(void *handle)
                value = true;
 
        gfxhub_v1_0_set_fault_enable_default(adev, value);
-       if (adev->asic_type == CHIP_ARCTURUS)
-               mmhub_v9_4_set_fault_enable_default(adev, value);
-       else
-               mmhub_v1_0_set_fault_enable_default(adev, value);
-
+       if (!amdgpu_sriov_vf(adev)) {
+               if (adev->asic_type == CHIP_ARCTURUS)
+                       mmhub_v9_4_set_fault_enable_default(adev, value);
+               else
+                       mmhub_v1_0_set_fault_enable_default(adev, value);
+       }
        for (i = 0; i < adev->num_vmhubs; ++i)
                gmc_v9_0_flush_gpu_tlb(adev, 0, i, 0);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
index ac61206c4ce62c2648df02ed990f24c7d4c44f3f..5c42387c9274a2f88aceb836435386d7535dad9f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
@@ -128,45 +128,53 @@ static void mmhub_v9_4_init_system_aperture_regs(struct amdgpu_device *adev,
                            hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
                            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)) {
+               /* 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);
 
-       /* Set default page address. */
-       value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start +
-               adev->vm_manager.vram_base_offset;
-       WREG32_SOC15_OFFSET(MMHUB, 0,
+               /* Set default page address. */
+               value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start +
+                       adev->vm_manager.vram_base_offset;
+               WREG32_SOC15_OFFSET(
+                       MMHUB, 0,
                        mmVMSHAREDPF0_MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB,
                        hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
                        (u32)(value >> 12));
-       WREG32_SOC15_OFFSET(MMHUB, 0,
+               WREG32_SOC15_OFFSET(
+                       MMHUB, 0,
                        mmVMSHAREDPF0_MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB,
                        hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
                        (u32)(value >> 44));
 
-       /* Program "protection fault". */
-       WREG32_SOC15_OFFSET(MMHUB, 0,
-                           mmVML2PF0_VM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32,
-                           hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
-                           (u32)(adev->dummy_page_addr >> 12));
-       WREG32_SOC15_OFFSET(MMHUB, 0,
-                           mmVML2PF0_VM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32,
-                           hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
-                           (u32)((u64)adev->dummy_page_addr >> 44));
+               /* Program "protection fault". */
+               WREG32_SOC15_OFFSET(
+                       MMHUB, 0,
+                       mmVML2PF0_VM_L2_PROTECTION_FAULT_DEFAULT_ADDR_LO32,
+                       hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
+                       (u32)(adev->dummy_page_addr >> 12));
+               WREG32_SOC15_OFFSET(
+                       MMHUB, 0,
+                       mmVML2PF0_VM_L2_PROTECTION_FAULT_DEFAULT_ADDR_HI32,
+                       hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
+                       (u32)((u64)adev->dummy_page_addr >> 44));
 
-       tmp = RREG32_SOC15_OFFSET(MMHUB, 0,
-                                 mmVML2PF0_VM_L2_PROTECTION_FAULT_CNTL2,
-                                 hubid * MMHUB_INSTANCE_REGISTER_OFFSET);
-       tmp = REG_SET_FIELD(tmp, VML2PF0_VM_L2_PROTECTION_FAULT_CNTL2,
-                           ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY, 1);
-       WREG32_SOC15_OFFSET(MMHUB, 0, mmVML2PF0_VM_L2_PROTECTION_FAULT_CNTL2,
-                           hubid * MMHUB_INSTANCE_REGISTER_OFFSET, tmp);
+               tmp = RREG32_SOC15_OFFSET(
+                       MMHUB, 0, mmVML2PF0_VM_L2_PROTECTION_FAULT_CNTL2,
+                       hubid * MMHUB_INSTANCE_REGISTER_OFFSET);
+               tmp = REG_SET_FIELD(tmp, VML2PF0_VM_L2_PROTECTION_FAULT_CNTL2,
+                                   ACTIVE_PAGE_MIGRATION_PTE_READ_RETRY, 1);
+               WREG32_SOC15_OFFSET(MMHUB, 0,
+                                   mmVML2PF0_VM_L2_PROTECTION_FAULT_CNTL2,
+                                   hubid * MMHUB_INSTANCE_REGISTER_OFFSET,
+                                   tmp);
+       }
 }
 
 static void mmhub_v9_4_init_tlb_regs(struct amdgpu_device *adev, int hubid)
@@ -372,10 +380,12 @@ int mmhub_v9_4_gart_enable(struct amdgpu_device *adev)
                mmhub_v9_4_init_gart_aperture_regs(adev, i);
                mmhub_v9_4_init_system_aperture_regs(adev, i);
                mmhub_v9_4_init_tlb_regs(adev, i);
-               mmhub_v9_4_init_cache_regs(adev, i);
+               if (!amdgpu_sriov_vf(adev))
+                       mmhub_v9_4_init_cache_regs(adev, i);
 
                mmhub_v9_4_enable_system_domain(adev, i);
-               mmhub_v9_4_disable_identity_aperture(adev, i);
+               if (!amdgpu_sriov_vf(adev))
+                       mmhub_v9_4_disable_identity_aperture(adev, i);
                mmhub_v9_4_setup_vmid_config(adev, i);
                mmhub_v9_4_program_invalidation(adev, i);
        }