[PATCH] savagefb: Fix black screen on load in Savage IX

[powerpc.git] / drivers / video / savage / savagefb_driver.c

diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 82b3dea..d952bf3 100644 (file)
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -384,6 +384,19 @@ SavageSetup2DEngine(struct savagefb_par  *par)
        BCI_SEND(0);
        BCI_SEND(BCI_CMD_SETREG | (1 << 16) | BCI_GBD2);
        BCI_SEND(GlobalBitmapDescriptor);
+
+       /*
+        * I don't know why, sending this twice fixes the intial black screen,
+        * prevents X from crashing at least in Toshiba laptops with SavageIX.
+        * --Tony
+        */
+       par->bci_ptr = 0;
+       par->SavageWaitFifo(par, 4);
+
+       BCI_SEND(BCI_CMD_SETREG | (1 << 16) | BCI_GBD1);
+       BCI_SEND(0);
+       BCI_SEND(BCI_CMD_SETREG | (1 << 16) | BCI_GBD2);
+       BCI_SEND(GlobalBitmapDescriptor);
 }
 
 static void savagefb_set_clip(struct fb_info *info)
@@ -833,7 +846,8 @@ static void savage_set_default_par(struct savagefb_par *par,
        vga_out8(0x3d5, cr66, par);
 }
 
-static void savage_update_var(struct fb_var_screeninfo *var, struct fb_videomode *modedb)
+static void savage_update_var(struct fb_var_screeninfo *var,
+                             const struct fb_videomode *modedb)
 {
        var->xres = var->xres_virtual = modedb->xres;
        var->yres = modedb->yres;
@@ -902,7 +916,7 @@ static int savagefb_check_var(struct fb_var_screeninfo   *var,
        }
 
        if (!mode_valid) {
-               struct fb_videomode *mode;
+               const struct fb_videomode *mode;
 
                mode = fb_find_best_mode(var, &info->modelist);
                if (mode) {
@@ -2206,11 +2220,10 @@ static int __devinit savagefb_probe(struct pci_dev* dev,
                             info->monspecs.modedb, info->monspecs.modedb_len,
                             NULL, 8);
        } else if (info->monspecs.modedb != NULL) {
-               struct fb_videomode *modedb;
+               const struct fb_videomode *mode;
 
-               modedb = fb_find_best_display(&info->monspecs,
-                                             &info->modelist);
-               savage_update_var(&info->var, modedb);
+               mode = fb_find_best_display(&info->monspecs, &info->modelist);
+               savage_update_var(&info->var, mode);
        }
 
        /* maximize virtual vertical length */