Hello everyone, testing my latest patches through productive use I noticed that we require a bit of a logic for the register read to not cause trouble at the time of unblanking. Thing is, blanking is implemented through deactivation of the LCD activation bit, so if we read back the register, the LCD backlight won't come back on until the LID is shut and reopened, effectively pushing the work to the BIOS. The following patch is on top of my previous one, adding a variable to struct neofb_par to remember if we want to read the respective register values next time we (un)blank. Logic depends on the assumption that we won't change display config in a blanked state, as a keypress should already be answered by unblanking. Essentially, we should read back the register values to variable on blank, and ignore them on unblank. Unfortunately, only checking for !blank_mode won't avoid the backlight remaining off, hence the additional checks. Signed-off-by: Christian Trefzer <[email protected]> --- a/include/video/neomagic.h 2006-01-03 04:21:10.000000000 +0100 +++ b/include/video/neomagic.h 2006-02-09 20:59:20.164839408 +0100 @@ -159,6 +159,7 @@ unsigned char PanelDispCntlReg1; unsigned char PanelDispCntlReg2; unsigned char PanelDispCntlReg3; + unsigned char PanelDispCntlRegRead; unsigned char PanelVertCenterReg1; unsigned char PanelVertCenterReg2; unsigned char PanelVertCenterReg3; --- a/drivers/video/neofb.c 2006-02-08 21:24:05.000000000 +0100 +++ b/drivers/video/neofb.c 2006-02-09 23:21:33.489914472 +0100 @@ -1334,8 +1334,11 @@ struct neofb_par *par = (struct neofb_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; + /* Reload the value stored in the register, if sensible. It might have been + * changed via FN keystroke. */ + if (par->PanelDispCntlRegRead && !blank_mode) { + par->PanelDispCntlReg1 = vga_rgfx(NULL, 0x20) & 0x03; + } switch (blank_mode) { case FB_BLANK_POWERDOWN: /* powerdown - both sync lines down */ @@ -1355,21 +1358,25 @@ tosh_smm(®s); } #endif + par->PanelDispCntlRegRead = 0; break; case FB_BLANK_HSYNC_SUSPEND: /* hsync off */ seqflags = VGA_SR01_SCREEN_OFF; /* Disable sequencer */ lcdflags = 0; /* LCD off */ dpmsflags = NEO_GR01_SUPPRESS_HSYNC; + par->PanelDispCntlRegRead = 0; break; case FB_BLANK_VSYNC_SUSPEND: /* vsync off */ seqflags = VGA_SR01_SCREEN_OFF; /* Disable sequencer */ lcdflags = 0; /* LCD off */ dpmsflags = NEO_GR01_SUPPRESS_VSYNC; + par->PanelDispCntlRegRead = 0; break; case FB_BLANK_NORMAL: /* just blank screen (backlight stays on) */ seqflags = VGA_SR01_SCREEN_OFF; /* Disable sequencer */ lcdflags = par->PanelDispCntlReg1 & 0x02; /* LCD normal */ dpmsflags = 0x00; /* no hsync/vsync suppression */ + par->PanelDispCntlRegRead = 0; break; case FB_BLANK_UNBLANK: /* unblank */ seqflags = 0; /* Enable sequencer */ @@ -1387,6 +1394,7 @@ tosh_smm(®s); } #endif + par->PanelDispCntlRegRead = 1; break; default: /* Anything else we don't understand; return 1 to tell * fb_blank we didn't aactually do anything */
Attachment:
pgpdUZ4TAFUzE.pgp
Description: PGP signature
- Follow-Ups:
- Re: [PATCH] neofb: add more logic to determine sensibility of register readback
- From: "Antonino A. Daplas" <[email protected]>
- Re: [PATCH] neofb: add more logic to determine sensibility of register readback
- References:
- [PATCH] neofb: avoid resetting display config on unblank
- From: Christian Trefzer <[email protected]>
- [PATCH] neofb: avoid resetting display config on unblank
- Prev by Date: Re: [PATCH] percpu data: only iterate over possible CPUs
- Next by Date: Re: CD writing in future Linux (stirring up a hornets' nest)
- Previous by thread: [PATCH] neofb: avoid resetting display config on unblank
- Next by thread: Re: [PATCH] neofb: add more logic to determine sensibility of register readback
- Index(es):
 |