drm/amdgpu/gmc6: use the vram location programmed by the vbios

This makes mc programming much simpler in future patches.

Since evergreen, the vbios has been programming the fb location
to the proper vram size.  The only reason to reprogram it would
be to change the location.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index d0214d942bfc..224b6935c885 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -228,12 +228,15 @@ static int gmc_v6_0_mc_load_microcode(struct amdgpu_device *adev)
 static void gmc_v6_0_vram_gtt_location(struct amdgpu_device *adev,
                                        struct amdgpu_mc *mc)
 {
+        u64 base = RREG32(mmMC_VM_FB_LOCATION) & 0xFFFF;
+        base <<= 24;
+
         if (mc->mc_vram_size > 0xFFC0000000ULL) {
                 dev_warn(adev->dev, "limiting VRAM\n");
                 mc->real_vram_size = 0xFFC0000000ULL;
                 mc->mc_vram_size = 0xFFC0000000ULL;
         }
-        amdgpu_vram_location(adev, &adev->mc, 0);
+        amdgpu_vram_location(adev, &adev->mc, base);
         adev->mc.gtt_base_align = 0;
         amdgpu_gtt_location(adev, mc);
 }