Revert "RADEON: memmap rework 1"

This reverts commit dd8ee1b444f4b973a1e0fadca5f943f2162b5e94.

Conflicts:

	src/radeon.h
	src/radeon_driver.c

This rework seems to have caused more trouble than it was worth.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/legacy_crtc.c b/src/legacy_crtc.c
index 12d1b9b8..5ef86ce4 100644
--- a/src/legacy_crtc.c
+++ b/src/legacy_crtc.c
@@ -1724,6 +1724,8 @@ legacy_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
     }
 
 
+    ErrorF("init memmap\n");
+    RADEONInitMemMapRegisters(pScrn, info->ModeReg, info);
     ErrorF("init common\n");
     RADEONInitCommonRegisters(info->ModeReg, info);
 
@@ -1777,6 +1779,8 @@ legacy_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
 	}
     }
 
+    ErrorF("restore memmap\n");
+    RADEONRestoreMemMapRegisters(pScrn, info->ModeReg);
     ErrorF("restore common\n");
     RADEONRestoreCommonRegisters(pScrn, info->ModeReg);
 
@@ -1800,7 +1804,7 @@ legacy_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
 	radeon_update_tv_routing(pScrn, info->ModeReg);
 
     if (info->DispPriority)
-	RADEONInitDispBandwidth(pScrn);
+        RADEONInitDispBandwidth(pScrn);
 
     if (tilingChanged) {
 	/* need to redraw front buffer, I guess this can be considered a hack ? */