From 6947580ab61d2ff6b8842a13e6979156e9acaad4 Mon Sep 17 00:00:00 2001 From: Christian Trefzer Date: Tue, 14 Feb 2006 13:53:26 -0800 Subject: [PATCH] --- yaml --- r: 20332 b: refs/heads/master c: 10ee39fe3ff618d274e1cd0f6abbc2917b736bfd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/neofb.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 02ea7aefc61d..24c96877bd4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2fbf1ace5cfefdd192f29fd4a027422f567c62d +refs/heads/master: 10ee39fe3ff618d274e1cd0f6abbc2917b736bfd diff --git a/trunk/drivers/video/neofb.c b/trunk/drivers/video/neofb.c index 747602aa5615..b85e2b180a44 100644 --- a/trunk/drivers/video/neofb.c +++ b/trunk/drivers/video/neofb.c @@ -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 */ @@ -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 */