 @@ -4443,48 +4443,64 @@ static void RADEONSaveMemMapRegisters(Sc
     RADEONInfoPtr  info       = RADEONPTR(pScrn);
     unsigned char *RADEONMMIO = info->MMIO;
     radeon_read_mc_fb_agp_location(pScrn, LOC_FB | LOC_AGP, &save->mc_fb_location,
 				   &save->mc_agp_location, &save->mc_agp_location_hi);
     if (!IS_AVIVO_VARIANT) {
         save->display_base_addr  = INREG(RADEON_DISPLAY_BASE_ADDR);
         save->display2_base_addr = INREG(RADEON_DISPLAY2_BASE_ADDR);
         save->ov0_base_addr      = INREG(RADEON_OV0_BASE_ADDR);
+    }
+}
 #if 0
 /* Read palette data */
 static void RADEONSavePalette(ScrnInfoPtr pScrn, RADEONSavePtr save)
+{
     RADEONInfoPtr  info       = RADEONPTR(pScrn);
     unsigned char *RADEONMMIO = info->MMIO;
     int            i;
 #ifdef ENABLE_FLAT_PANEL
     /* Select palette 0 (main CRTC) if using FP-enabled chip */
  /* if (info->Port1 == MT_DFP) PAL_SELECT(1); */
 #endif
     PAL_SELECT(1);
     INPAL_START(0);
-    for (i = 0; i < 256; i++) save->palette2[i] = INPAL_NEXT();
+    for (i = 0; i < 256; i++) {
 	save->palette2[i] = INREG(RADEON_PALETTE_30_DATA);
+    }
     PAL_SELECT(0);
     INPAL_START(0);
-    for (i = 0; i < 256; i++) save->palette[i] = INPAL_NEXT();
+    for (i = 0; i < 256; i++) {
-    save->palette_valid = TRUE;
+	save->palette[i] = INREG(RADEON_PALETTE_30_DATA);
+    }
+}
 static void RADEONRestorePalette(ScrnInfoPtr pScrn, RADEONSavePtr restore)
+{
     RADEONInfoPtr  info       = RADEONPTR(pScrn);
     unsigned char *RADEONMMIO = info->MMIO;
     int            i;
     PAL_SELECT(1);
     OUTPAL_START(0);
     for (i = 0; i < 256; i++) {
 	OUTREG(RADEON_PALETTE_30_DATA, restore->palette2[i]);
+    }
     PAL_SELECT(0);
     OUTPAL_START(0);
     for (i = 0; i < 256; i++) {
 	OUTREG(RADEON_PALETTE_30_DATA, restore->palette[i]);
+    }
+}
 #endif
 static void
 avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save)
+{
     RADEONInfoPtr info = RADEONPTR(pScrn);
     unsigned char *RADEONMMIO = info->MMIO;
     struct avivo_state *state = &save->avivo;
     int i, j;
     //    state->vga_memory_base = INREG(AVIVO_VGA_MEMORY_BASE);
     //    state->vga_fb_start = INREG(AVIVO_VGA_FB_START);
     state->vga1_cntl = INREG(AVIVO_D1VGA_CONTROL);
     state->vga2_cntl = INREG(AVIVO_D2VGA_CONTROL);
 @@ -5337,26 +5353,28 @@ static void RADEONSave(ScrnInfoPtr pScrn
 	avivo_save(pScrn, save);
     } else {
 	save->dp_datatype      = INREG(RADEON_DP_DATATYPE);
 	save->rbbm_soft_reset  = INREG(RADEON_RBBM_SOFT_RESET);
 	save->clock_cntl_index = INREG(RADEON_CLOCK_CNTL_INDEX);
 	RADEONPllErrataAfterIndex(info);
 	RADEONSaveMemMapRegisters(pScrn, save);
 	RADEONSaveCommonRegisters(pScrn, save);
 	RADEONSavePLLRegisters(pScrn, save);
 	RADEONSaveCrtcRegisters(pScrn, save);
 	RADEONSaveFPRegisters(pScrn, save);
 	RADEONSaveDACRegisters(pScrn, save);
 	RADEONSavePalette(pScrn, save);
 	if (pRADEONEnt->HasCRTC2) {
 	    RADEONSaveCrtc2Registers(pScrn, save);
 	    RADEONSavePLL2Registers(pScrn, save);
+	}
 	if (info->InternalTVOut)
 	    RADEONSaveTVRegisters(pScrn, save);
+    }
     if (info->ChipFamily < CHIP_FAMILY_R600)
         RADEONSaveSurfaces(pScrn, save);
+}
 @@ -5458,44 +5476,35 @@ static void RADEONRestore(ScrnInfoPtr pS
 # else
        vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_ALL );
 # endif
        vgaHWLock(hwp);
+    }
 #endif
     /* to restore console mode, DAC registers should be set after every other registers are set,
      * otherwise,we may get blank screen
      */
     if (IS_AVIVO_VARIANT)
 	avivo_restore_vga_regs(pScrn, restore);
-    if (!IS_AVIVO_VARIANT)
+    if (!IS_AVIVO_VARIANT) {
 	RADEONRestorePalette(pScrn, restore);
 	RADEONRestoreDACRegisters(pScrn, restore);
+    }
 #if 0
     RADEONWaitForVerticalSync(pScrn);
 #endif
+}
 #if 0
 /* Define initial palette for requested video mode.  This doesn't do
  * anything for XFree86 4.0.
  */
 static void RADEONInitPalette(RADEONSavePtr save)
     save->palette_valid = FALSE;
 #endif
 static Bool RADEONSaveScreen(ScreenPtr pScreen, int mode)
+{
     ScrnInfoPtr  pScrn = xf86Screens[pScreen->myNum];
     Bool         unblank;
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
 		   "RADEONSaveScreen(%d)\n", mode);
     unblank = xf86IsUnblank(mode);
     if (unblank) SetTimeSinceLastInputEvent();
     if ((pScrn != NULL) && pScrn->vtSema) {
 	if (unblank)