Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 20332
b: refs/heads/master
c: 10ee39f
h: refs/heads/master
v: v3
  • Loading branch information
Christian Trefzer authored and Linus Torvalds committed Feb 15, 2006
1 parent 28c47ae commit 6947580
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e2fbf1ace5cfefdd192f29fd4a027422f567c62d
refs/heads/master: 10ee39fe3ff618d274e1cd0f6abbc2917b736bfd
8 changes: 7 additions & 1 deletion trunk/drivers/video/neofb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1334,6 +1334,12 @@ 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, might have been changed via
* FN keystroke
*/
par->PanelDispCntlReg1 = vga_rgfx(NULL, 0x20) & 0x03;

switch (blank_mode) {
case FB_BLANK_POWERDOWN: /* powerdown - both sync lines down */
seqflags = VGA_SR01_SCREEN_OFF; /* Disable sequencer */
Expand Down Expand Up @@ -1366,7 +1372,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 */
Expand Down

0 comments on commit 6947580

Please sign in to comment.