diff --git a/linux-core/radeon_gem.c b/linux-core/radeon_gem.c
index 24c806a..8dc8b42 100644
--- a/linux-core/radeon_gem.c
+++ b/linux-core/radeon_gem.c
@@ -787,7 +787,7 @@ int radeon_gem_mm_init(struct drm_device *dev)
 	/* size the mappable VRAM memory for now */
 	radeon_vram_setup(dev);
 	
-	radeon_init_memory_map(dev);
+	//radeon_init_memory_map(dev);
 
 #define VRAM_RESERVE_TEXT (64*1024)
 	dev_priv->mm.vram_visible -= VRAM_RESERVE_TEXT;
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 6b71360..3d382fa 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -2511,6 +2511,12 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
 	drm_bo_driver_init(dev);
 
 	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+
+               dev_priv->fb_location = (radeon_read_fb_location(dev_priv) & 0xffff) << 16;
+               dev_priv->fb_size =
+                       ((radeon_read_fb_location(dev_priv) & 0xffff0000u) + 0x10000)
+                       - dev_priv->fb_location;
+
 	
 		radeon_gem_mm_init(dev);
 		radeon_modeset_init(dev);