Revert radeon AGP aperture offset changes

This reverts the series of commits

	67dbb4ea33731415fe09c62149a34f472719ac1d
	281ab031a8c9e5b593142eb4ec59a87faae8676a
	47807ce381acc34a7ffee2b42e35e96c0f322e52

that changed the GART VM start offset.  It fixed some machines, but
seems to continually interact badly with some X versions.

Quoth Ben Herrenschmidt:

  "So I think at this point, the best is that we keep the old bogus code
   that at least is consistent with the bug in the server. I'm working on a
   big patch to X that reworks the memory map stuff completely and fixes
   those issues on the server side, I'll do a DRM patch matching this X fix
   as well so that the memory map is only ever set in one place and with
   what I hope is a correct algorithm..."

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index b517ae515801bb39260d398e784d703979435d0c..342302d4674352f85f63b5fa9847b25e98129bd2 100644 (file)
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1312,8 +1312,6 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
 static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
 {
        drm_radeon_private_t *dev_priv = dev->dev_private;
-       unsigned int mem_size, aper_size;
-
        DRM_DEBUG("\n");
 
        dev_priv->is_pci = init->is_pci;
@@ -1523,13 +1521,8 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
                                          + dev_priv->fb_location) >> 10));
 
        dev_priv->gart_size = init->gart_size;
-
-       mem_size = RADEON_READ(RADEON_CONFIG_MEMSIZE);
-       if (mem_size == 0)
-               mem_size = 0x800000;
-       aper_size = max(RADEON_READ(RADEON_CONFIG_APER_SIZE), mem_size);
-
-       dev_priv->gart_vm_start = dev_priv->fb_location + aper_size;
+       dev_priv->gart_vm_start = dev_priv->fb_location
+           + RADEON_READ(RADEON_CONFIG_APER_SIZE);
 
 #if __OS_HAS_AGP
        if (!dev_priv->is_pci)