Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kernel/git/galak/powerpc

1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 747602aa5615..a2e201dc40f7 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -843,6 +843,9 @@ static int neofb_set_par(struct fb_info *info)
 
         par->SysIfaceCntl2 = 0xc0;      /* VESA Bios sets this to 0x80! */
 
+        /* Initialize: by default, we want display config register to be read */
+        par->PanelDispCntlRegRead = 1;
+
         /* Enable any user specified display devices. */
         par->PanelDispCntlReg1 = 0x00;
         if (par->internal_display)
@@ -1334,6 +1337,18 @@ static int neofb_blank(int blank_mode, struct fb_info *info)
         struct neofb_par *par = info->par;
         int seqflags, lcdflags, dpmsflags, reg;
 
+
+        /*
+         * Reload the value stored in the register, if sensible. It might have
+         * been changed via FN keystroke.
+         */
+        if (par->PanelDispCntlRegRead) {
+                neoUnlock();
+                par->PanelDispCntlReg1 = vga_rgfx(NULL, 0x20) & 0x03;
+                neoLock(&par->state);
+        }
+        par->PanelDispCntlRegRead = !blank_mode;
+
         switch (blank_mode) {
         case FB_BLANK_POWERDOWN:        /* powerdown - both sync lines down */
                 seqflags = VGA_SR01_SCREEN_OFF; /* Disable sequencer */
@@ -1366,7 +1381,7 @@ static int neofb_blank(int blank_mode, struct fb_info *info)
         case FB_BLANK_NORMAL:           /* just blank screen (backlight stays on) */
                 seqflags = VGA_SR01_SCREEN_OFF; /* Disable sequencer */
                 lcdflags = par->PanelDispCntlReg1 & 0x02; /* LCD normal */
-                dpmsflags = 0;                  /* no hsync/vsync suppression */
+                dpmsflags = 0x00;       /* no hsync/vsync suppression */
                 break;
         case FB_BLANK_UNBLANK:          /* unblank */
                 seqflags = 0;                   /* Enable sequencer */