 @@ -567,29 +567,26 @@ void R128GetPanelInfoFromBIOS(xf86Output
         r128_output->PanelXRes = R128_BIOS16(info->FPBIOSstart + 25);
     if (!r128_output->PanelYRes)
         r128_output->PanelYRes = R128_BIOS16(info->FPBIOSstart + 27);
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Panel size: %dx%d\n",
                r128_output->PanelXRes, r128_output->PanelYRes);
     r128_output->PanelPwrDly = R128_BIOS8(info->FPBIOSstart + 56);
     if (!r128_output->PanelXRes || !r128_output->PanelYRes) {
         info->HasPanelRegs = FALSE;
         xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 		   "Can't determine panel dimensions, and none specified.\n"
 		   "\tDisabling programming of FP registers.\n");
     } else {
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Panel size: %dx%d\n",
 		   info->PanelXRes, info->PanelYRes);
+    }
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Panel ID: ");
     for (i = 1; i <= 24; i++)
         ErrorF("%c", R128_BIOS8(info->FPBIOSstart + i));
     ErrorF("\n");
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Panel Type: ");
     i = R128_BIOS16(info->FPBIOSstart + 29);
     if (i & 1) ErrorF("Color, ");
     else       ErrorF("Monochrome, ");
     if (i & 2) ErrorF("Dual(split), ");
 @@ -1706,36 +1703,26 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DEC
     if (!R128MapMem(pScrn)) return FALSE;
     pScrn->fbOffset    = 0;
     //if(info->IsSecondary) pScrn->fbOffset = pScrn->videoRam * 1024;
 #ifdef R128DRI
     info->fbX          = 0;
     info->fbY          = 0;
     info->frontOffset  = 0;
     info->frontPitch   = pScrn->displayWidth;
 #endif
     info->PaletteSavedOnVT = FALSE;
     R128Save(pScrn);
 #ifndef AVOID_FBDEV
     if (info->FBDev) {
 	if (!fbdevHWModeInit(pScrn, pScrn->currentMode)) return FALSE;
     } else {
 #endif
 	if (!R128ModeInit(pScrn, pScrn->currentMode)) return FALSE;
     R128SaveScreen(pScreen, SCREEN_SAVER_ON);
     pScrn->AdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
 				/* Visual setup */
     miClearVisualTypes();
     if (!miSetVisualTypes(pScrn->depth,
 			  miGetDefaultVisualMask(pScrn->depth),
 			  pScrn->rgbBits,
 			  pScrn->defaultVisual)) return FALSE;
     miSetPixmapDepths ();
     noAccel = xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE);
     if (noAccel) info->useEXA = FALSE;
 #ifdef R128DRI
 @@ -2091,31 +2078,35 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DEC
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		       "Filled in offs\n");
 	    info->ExaDriver->memorySize = info->FbMapSize;
 	    R128VerboseInitEXA(pScreen);
+	}
 #endif
+    }
     pScrn->vtSema = TRUE;
     /* xf86CrtcRotate accesses pScrn->pScreen */
     pScrn->pScreen = pScreen;
 #ifndef AVOID_FBDEV
     if (info->FBDev) {
 	if (!fbdevHWModeInit(pScrn, pScrn->currentMode)) return FALSE;
     } else {
 #endif
 	if (!xf86SetDesiredModes(pScrn)) return FALSE;
 #ifndef AVOID_FBDEV
+    }
 #endif
     R128SaveScreen(pScreen, SCREEN_SAVER_ON);
     //pScrn->AdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
 				/* DGA setup */
 #ifdef XFreeXDGA
     xf86DiDGAInit(pScreen, info->LinearAddr + pScrn->fbOffset);
 #endif
 				/* Backing store setup */
     xf86SetBackingStore(pScreen);
 				/* Set Silken Mouse */
 @@ -2139,39 +2130,30 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DEC
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		       "Hardware cursor initialization failed\n");
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using software cursor\n");
+	}
     } else {
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using software cursor\n");
+    }
     /* DPMS setup - FIXME: also for mirror mode in non-fbdev case? - Michel */
 #ifndef AVOID_FBDEV
     if (info->FBDev)
 	xf86DPMSInit(pScreen, fbdevHWDPMSSetWeak(), 0);
     else
         xf86DPMSInit(pScreen, xf86DPMSSet, 0);
     else
 #endif
         xf86DPMSInit(pScreen, xf86DPMSSet, 0);
 	if (info->DisplayType == MT_LCD)
 	    xf86DPMSInit(pScreen, R128DisplayPowerManagementSetLCD, 0);
 	else
 	    xf86DPMSInit(pScreen, R128DisplayPowerManagementSet, 0);
-    if (!info->IsSecondary)
+    R128InitVideo(pScreen);
 	R128InitVideo(pScreen);
 				/* Provide SaveScreen */
     pScreen->SaveScreen  = R128SaveScreen;
 				/* Wrap CloseScreen */
     info->CloseScreen    = pScreen->CloseScreen;
     pScreen->CloseScreen = R128CloseScreen;
 				/* Note unused options */
     if (serverGeneration == 1)
 	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
 #ifdef R128DRI
 @@ -2777,33 +2759,35 @@ static void R128Restore(ScrnInfoPtr pScr
     if (pR128Ent->HasCRTC2) {
         R128RestoreDDA2Registers(pScrn, restore);
         R128RestoreCrtc2Registers(pScrn, restore);
         R128RestorePLL2Registers(pScrn, restore);
+    }
     R128RestoreDDARegisters(pScrn, restore);
     R128RestoreCrtcRegisters(pScrn, restore);
     R128RestorePLLRegisters(pScrn, restore);
     R128RestoreDACRegisters(pScrn, restore);
     R128RestoreRMXRegisters(pScrn, restore);
     R128RestoreFPRegisters(pScrn, restore);
     R128RestoreLVDSRegisters(pScrn, restore);
 #if 0
     if (!info->IsSecondary) {
         OUTREG(R128_AMCGPIO_MASK,     restore->amcgpio_mask);
         OUTREG(R128_AMCGPIO_EN_REG,   restore->amcgpio_en_reg);
         OUTREG(R128_CLOCK_CNTL_INDEX, restore->clock_cntl_index);
         OUTREG(R128_GEN_RESET_CNTL,   restore->gen_reset_cntl);
         OUTREG(R128_DP_DATATYPE,      restore->dp_datatype);
+    }
 #endif
 #ifdef WITH_VGAHW
     if (info->VGAAccess) {
         vgaHWPtr hwp = VGAHWPTR(pScrn);
         vgaHWUnlock(hwp);
 # if defined(__powerpc__)
         /* Temporary hack to prevent crashing on PowerMacs when trying to
          * write VGA fonts, will find a better solution in the future
          */
         vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE );
 # else
         vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
 # endif
 @@ -3619,34 +3603,32 @@ void R128AdjustFrame(ADJUST_FRAME_ARGS_D
 /* Called when VT switching back to the X server.  Reinitialize the video
    mode. */
 Bool R128EnterVT(VT_FUNC_ARGS_DECL)
+{
     SCRN_INFO_PTR(arg);
     R128InfoPtr info  = R128PTR(pScrn);
     R128TRACE(("R128EnterVT\n"));
     pScrn->vtSema = TRUE;
 #ifndef AVOID_FBDEV
     if (info->FBDev) {
         if (!fbdevHWEnterVT(VT_FUNC_ARGS)) return FALSE;
-    } else
+    } else {
 #endif
-    if (!R128ModeInit(pScrn, pScrn->currentMode)) return FALSE;
+	if (!xf86SetDesiredModes(pScrn)) return FALSE;
-    else {
+#ifndef AVOID_FBDEV
         if (!xf86SetDesiredModes(pScrn)) return FALSE;
+    }
 #endif
     //if (!R128ModeInit(pScrn, pScrn->currentMode)) return FALSE;
     if (info->accelOn)
 	R128EngineInit(pScrn);
 #ifdef R128DRI
     if (info->directRenderingEnabled) {
 	if (info->irq) {
 	    /* Need to make sure interrupts are enabled */
 	    unsigned char *R128MMIO = info->MMIO;
 	    OUTREG(R128_GEN_INT_CNTL, info->gen_int_cntl);
+	}
 	R128CCE_START(pScrn, info);
 	DRIUnlock(pScrn->pScreen);
 @@ -3745,139 +3727,13 @@ void R128FreeScreen(FREE_SCREEN_ARGS_DEC
+{
     SCRN_INFO_PTR(arg);
     R128InfoPtr   info      = R128PTR(pScrn);
     R128TRACE(("R128FreeScreen\n"));
     if (info == NULL)
 	return;
 #ifdef WITH_VGAHW
     if (info->VGAAccess && xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
 	vgaHWFreeHWRec(pScrn);
 #endif
     R128FreeRec(pScrn);
+}
 /* Sets VESA Display Power Management Signaling (DPMS) Mode.  */
 static void R128DisplayPowerManagementSet(ScrnInfoPtr pScrn,
 					  int PowerManagementMode, int flags)
     R128InfoPtr   info      = R128PTR(pScrn);
     unsigned char *R128MMIO = info->MMIO;
     int           mask      = (R128_CRTC_DISPLAY_DIS
 			       | R128_CRTC_HSYNC_DIS
 			       | R128_CRTC_VSYNC_DIS);
     int             mask2     = R128_CRTC2_DISP_DIS;
     switch (PowerManagementMode) {
     case DPMSModeOn:
 	/* Screen: On; HSync: On, VSync: On */
 	if (info->IsSecondary)
 		OUTREGP(R128_CRTC2_GEN_CNTL, 0, ~mask2);
 	else
 		OUTREGP(R128_CRTC_EXT_CNTL, 0, ~mask);
 	break;
     case DPMSModeStandby:
 	/* Screen: Off; HSync: Off, VSync: On */
 	if (info->IsSecondary)
 		OUTREGP(R128_CRTC2_GEN_CNTL, R128_CRTC2_DISP_DIS, ~mask2);
 	    else
 		OUTREGP(R128_CRTC_EXT_CNTL,
 			R128_CRTC_DISPLAY_DIS | R128_CRTC_HSYNC_DIS, ~mask);
 	break;
     case DPMSModeSuspend:
 	/* Screen: Off; HSync: On, VSync: Off */
 	if (info->IsSecondary)
 		OUTREGP(R128_CRTC2_GEN_CNTL, R128_CRTC2_DISP_DIS, ~mask2);
 	else
 		OUTREGP(R128_CRTC_EXT_CNTL,
 			R128_CRTC_DISPLAY_DIS | R128_CRTC_VSYNC_DIS, ~mask);
 	break;
     case DPMSModeOff:
 	/* Screen: Off; HSync: Off, VSync: Off */
 	if (info->IsSecondary)
 		OUTREGP(R128_CRTC2_GEN_CNTL, mask2, ~mask2);
 	else
 		OUTREGP(R128_CRTC_EXT_CNTL, mask, ~mask);
 	break;
     if(info->isDFP) {
 	switch (PowerManagementMode) {
 	case DPMSModeOn:
 	    OUTREG(R128_FP_GEN_CNTL, INREG(R128_FP_GEN_CNTL) | (R128_FP_FPON | R128_FP_TDMS_EN));
 	    break;
 	case DPMSModeStandby:
 	case DPMSModeSuspend:
 	case DPMSModeOff:
 	    OUTREG(R128_FP_GEN_CNTL, INREG(R128_FP_GEN_CNTL) & ~(R128_FP_FPON | R128_FP_TDMS_EN));
 	    break;
 static int r128_set_backlight_enable(ScrnInfoPtr pScrn, int on);
 static void R128DisplayPowerManagementSetLCD(ScrnInfoPtr pScrn,
 					  int PowerManagementMode, int flags)
     R128InfoPtr   info      = R128PTR(pScrn);
     unsigned char *R128MMIO = info->MMIO;
     int           mask      = R128_LVDS_DISPLAY_DIS;
     switch (PowerManagementMode) {
     case DPMSModeOn:
 	/* Screen: On; HSync: On, VSync: On */
 	OUTREGP(R128_LVDS_GEN_CNTL, 0, ~mask);
         r128_set_backlight_enable(pScrn, 1);
 	break;
     case DPMSModeStandby:
 	/* Fall through */
     case DPMSModeSuspend:
 	/* Fall through */
     case DPMSModeOff:
 	/* Screen: Off; HSync: Off, VSync: Off */
 	OUTREGP(R128_LVDS_GEN_CNTL, mask, ~mask);
         r128_set_backlight_enable(pScrn, 0);
 	break;
 static int r128_set_backlight_enable(ScrnInfoPtr pScrn, int on)
         R128InfoPtr info        = R128PTR(pScrn);
         unsigned char *R128MMIO = info->MMIO;
 	unsigned int lvds_gen_cntl = INREG(R128_LVDS_GEN_CNTL);
 	lvds_gen_cntl |= (/*R128_LVDS_BL_MOD_EN |*/ R128_LVDS_BLON);
 	if (on) {
 		lvds_gen_cntl |= R128_LVDS_DIGON;
 		if (!(lvds_gen_cntl & R128_LVDS_ON)) {
 			lvds_gen_cntl &= ~R128_LVDS_BLON;
 			OUTREG(R128_LVDS_GEN_CNTL, lvds_gen_cntl);
 			(void)INREG(R128_LVDS_GEN_CNTL);
 			usleep(10000);
 			lvds_gen_cntl |= R128_LVDS_BLON;
 			OUTREG(R128_LVDS_GEN_CNTL, lvds_gen_cntl);
 #if 0
 		lvds_gen_cntl &= ~R128_LVDS_BL_MOD_LEVEL_MASK;
 		lvds_gen_cntl |= (0xFF /* backlight_conv[level] */ <<
 				  R128_LVDS_BL_MOD_LEVEL_SHIFT);
 #endif
 		lvds_gen_cntl |= (R128_LVDS_ON | R128_LVDS_EN);
 		lvds_gen_cntl &= ~R128_LVDS_DISPLAY_DIS;
 	} else {
 #if 0
 		lvds_gen_cntl &= ~R128_LVDS_BL_MOD_LEVEL_MASK;
 		lvds_gen_cntl |= (0xFF /* backlight_conv[0] */ <<
 				  R128_LVDS_BL_MOD_LEVEL_SHIFT);
 #endif
 		lvds_gen_cntl |= R128_LVDS_DISPLAY_DIS;
 		OUTREG(R128_LVDS_GEN_CNTL, lvds_gen_cntl);
 		usleep(10);
 		lvds_gen_cntl &= ~(R128_LVDS_ON | R128_LVDS_EN | R128_LVDS_BLON
 				   | R128_LVDS_DIGON);
 	OUTREG(R128_LVDS_GEN_CNTL, lvds_gen_cntl);
 	return 0;