drm/radeon: clean up vram/gtt location handling

Add a per-asic MC (memory controller) mask which holds the
mak address mask the asic is capable of.  Use this when
calculating the vram and gtt locations rather using asic
specific functions or limiting everything to 32 bits.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 2 insertions, 42 deletions

diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index bafbe3216952..862b52c69882 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -2538,46 +2538,6 @@ static void si_mc_program(struct radeon_device *rdev)
         rv515_vga_render_disable(rdev);
 }
 
-/* SI MC address space is 40 bits */
-static void si_vram_location(struct radeon_device *rdev,
-                             struct radeon_mc *mc, u64 base)
-{
-        mc->vram_start = base;
-        if (mc->mc_vram_size > (0xFFFFFFFFFFULL - base + 1)) {
-                dev_warn(rdev->dev, "limiting VRAM to PCI aperture size\n");
-                mc->real_vram_size = mc->aper_size;
-                mc->mc_vram_size = mc->aper_size;
-        }
-        mc->vram_end = mc->vram_start + mc->mc_vram_size - 1;
-        dev_info(rdev->dev, "VRAM: %lluM 0x%016llX - 0x%016llX (%lluM used)\n",
-                        mc->mc_vram_size >> 20, mc->vram_start,
-                        mc->vram_end, mc->real_vram_size >> 20);
-}
-
-static void si_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
-{
-        u64 size_af, size_bf;
-
-        size_af = ((0xFFFFFFFFFFULL - mc->vram_end) + mc->gtt_base_align) & ~mc->gtt_base_align;
-        size_bf = mc->vram_start & ~mc->gtt_base_align;
-        if (size_bf > size_af) {
-                if (mc->gtt_size > size_bf) {
-                        dev_warn(rdev->dev, "limiting GTT\n");
-                        mc->gtt_size = size_bf;
-                }
-                mc->gtt_start = (mc->vram_start & ~mc->gtt_base_align) - mc->gtt_size;
-        } else {
-                if (mc->gtt_size > size_af) {
-                        dev_warn(rdev->dev, "limiting GTT\n");
-                        mc->gtt_size = size_af;
-                }
-                mc->gtt_start = (mc->vram_end + 1 + mc->gtt_base_align) & ~mc->gtt_base_align;
-        }
-        mc->gtt_end = mc->gtt_start + mc->gtt_size - 1;
-        dev_info(rdev->dev, "GTT: %lluM 0x%016llX - 0x%016llX\n",
-                        mc->gtt_size >> 20, mc->gtt_start, mc->gtt_end);
-}
-
 static void si_vram_gtt_location(struct radeon_device *rdev,
                                  struct radeon_mc *mc)
 {
@@ -2587,9 +2547,9 @@ static void si_vram_gtt_location(struct radeon_device *rdev,
                 mc->real_vram_size = 0xFFC0000000ULL;
                 mc->mc_vram_size = 0xFFC0000000ULL;
         }
-        si_vram_location(rdev, &rdev->mc, 0);
+        radeon_vram_location(rdev, &rdev->mc, 0);
         rdev->mc.gtt_base_align = 0;
-        si_gtt_location(rdev, mc);
+        radeon_gtt_location(rdev, mc);
 }
 
 static int si_mc_init(struct radeon_device *rdev)