drm/radeon/kms: respect TOM on rs100->rs480 IGP variants.

Normally we are free to place VRAM where we want in the GPUs
memory address space, however on IGP chips the VRAM is actual RAM,
and no special translation or aperture is used inside the GPU MC.

So when you move the VRAM aperture away from the TOM register,
you actually move it into main memory and can trash things quite badly.

This commit makes the code respect the TOM location for MC_FB_LOCATION.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 1b23106f9552..a3db56bb013d 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -215,7 +215,6 @@ int r100_mc_init(struct radeon_device *rdev)
         r100_pci_gart_disable(rdev);
 
         /* Setup GPU memory space */
-        rdev->mc.vram_location = 0xFFFFFFFFUL;
         rdev->mc.gtt_location = 0xFFFFFFFFUL;
         if (rdev->flags & RADEON_IS_AGP) {
                 r = radeon_agp_init(rdev);
@@ -1265,6 +1264,8 @@ void r100_vram_info(struct radeon_device *rdev)
                 /* read NB_TOM to get the amount of ram stolen for the GPU */
                 tom = RREG32(RADEON_NB_TOM);
                 rdev->mc.vram_size = (((tom >> 16) - (tom & 0xffff) + 1) << 16);
+                /* for IGPs we need to keep VRAM where it was put by the BIOS */
+                rdev->mc.vram_location = (tom & 0xffff) << 16;
                 WREG32(RADEON_CONFIG_MEMSIZE, rdev->mc.vram_size);
         } else {
                 rdev->mc.vram_size = RREG32(RADEON_CONFIG_MEMSIZE);
@@ -1275,6 +1276,8 @@ void r100_vram_info(struct radeon_device *rdev)
                         rdev->mc.vram_size = 8192 * 1024;
                         WREG32(RADEON_CONFIG_MEMSIZE, rdev->mc.vram_size);
                 }
+                /* let driver place VRAM */
+                rdev->mc.vram_location = 0xFFFFFFFFUL;
         }
 
         rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);