drm/amdgpu: remove FB location config for sriov

FB location is already programmed by HV driver
for arcutus so remove this part

Signed-off-by: Frank.Min <Frank.Min@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/gfxhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
index e91bd79457779ed2a91fa03ef6a374c193f1d6a4..e9a9d24c2b7f44d1603496dbe4ef215ef2649210 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
@@ -264,7 +264,7 @@ static void gfxhub_v1_0_program_invalidation(struct amdgpu_device *adev)
 
 int gfxhub_v1_0_gart_enable(struct amdgpu_device *adev)
 {
-       if (amdgpu_sriov_vf(adev)) {
+       if (amdgpu_sriov_vf(adev) && adev->asic_type != CHIP_ARCTURUS) {
                /*
                 * MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are
                 * VF copy registers so vbios post doesn't program them, for

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
index d9301e80522aa9c9c7b9fde080487be4ba1bbcfb..ac61206c4ce62c2648df02ed990f24c7d4c44f3f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
@@ -368,22 +368,6 @@ int mmhub_v9_4_gart_enable(struct amdgpu_device *adev)
        int i;
 
        for (i = 0; i < MMHUB_NUM_INSTANCES; i++) {
-               if (amdgpu_sriov_vf(adev)) {
-                       /*
-                        * MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase
-                        * they are VF copy registers so vbios post doesn't
-                        * program them, for SRIOV driver need to program them
-                        */
-                       WREG32_SOC15_OFFSET(MMHUB, 0,
-                                    mmVMSHAREDVC0_MC_VM_FB_LOCATION_BASE,
-                                    i * MMHUB_INSTANCE_REGISTER_OFFSET,
-                                    adev->gmc.vram_start >> 24);
-                       WREG32_SOC15_OFFSET(MMHUB, 0,
-                                    mmVMSHAREDVC0_MC_VM_FB_LOCATION_TOP,
-                                    i * MMHUB_INSTANCE_REGISTER_OFFSET,
-                                    adev->gmc.vram_end >> 24);
-               }
-
                /* GART Enable. */
                mmhub_v9_4_init_gart_aperture_regs(adev, i);
                mmhub_v9_4_init_system_aperture_regs(adev, i);