diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 7424577..5820456 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1267,12 +1267,15 @@ static void RADEONInitMemoryMap(ScrnInfoPtr pScrn)
     radeon_read_mc_fb_agp_location(pScrn, LOC_FB | LOC_AGP, &info->mc_fb_location,
 				   &info->mc_agp_location, &info->mc_agp_location_hi);
 
+    ErrorF("fb_loc: 0x%08x\n", info->mc_fb_location);
+
     /* We shouldn't use info->videoRam here which might have been clipped
      * but the real video RAM instead
      */
     if (info->ChipFamily >= CHIP_FAMILY_R600) {
 	mem_size = INREG(R600_CONFIG_MEMSIZE);
 	aper_size = INREG(R600_CONFIG_APER_SIZE);
+	ErrorF("memsize: 0x%08x, apersize: 0x%08x\n", mem_size, aper_size);
     } else {
 	mem_size = INREG(RADEON_CONFIG_MEMSIZE);
 	aper_size = INREG(RADEON_CONFIG_APER_SIZE);
@@ -1317,6 +1320,8 @@ static void RADEONInitMemoryMap(ScrnInfoPtr pScrn)
 		aper0_base = INREG(RADEON_CONFIG_APER_0_BASE);
 	    }
 
+	    ErrorF("aper0_base: 0x%08x\n", aper0_base);
+
 	    /* Recent chips have an "issue" with the memory controller, the
 	     * location must be aligned to the size. We just align it down,
 	     * too bad if we walk over the top of system memory, we don't
@@ -1345,21 +1350,16 @@ static void RADEONInitMemoryMap(ScrnInfoPtr pScrn)
     if (info->ChipFamily >= CHIP_FAMILY_R600) {
 	info->fbLocation = (info->mc_fb_location & 0xffff) << 24;
     } else {
-   	info->fbLocation = (info->mc_fb_location & 0xffff) << 16;
+	info->fbLocation = (info->mc_fb_location & 0xffff) << 16;
     }
     /* Just disable the damn AGP apertures for now, it may be
      * re-enabled later by the DRM
      */
 
-    if (IS_AVIVO_VARIANT) {
-	if (info->ChipFamily >= CHIP_FAMILY_R600) {
-	    OUTREG(R600_HDP_NONSURFACE_BASE, (info->mc_fb_location << 16) & 0xff0000);
-	} else {
-	    OUTREG(AVIVO_HDP_FB_LOCATION, info->mc_fb_location);
-	}
-    	info->mc_agp_location = 0x003f0000;
-    } else
-    	info->mc_agp_location = 0xffffffc0;
+    if (IS_AVIVO_VARIANT)
+	info->mc_agp_location = 0x003f0000;
+    else
+	info->mc_agp_location = 0xffffffc0;
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 	       "RADEONInitMemoryMap() : \n");
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -3329,6 +3329,8 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      */
     RADEONInitMemoryMap(pScrn);
 
+    return FALSE;
+
     /* empty the surfaces */
     if (info->ChipFamily < CHIP_FAMILY_R600) {
 	unsigned char *RADEONMMIO = info->MMIO;