[PATCH 4/6] fbcon: Save blank state last

[PATCH 4/6] fbcon: Save blank state last

[Antonino A. Daplas]

Save blank state after do_blank|unblank_screen() since this flag is checked
in fbcon_blank().

Signed-off-by: Antonino Daplas <adaplas@pol.net>
---

 fbcon.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -Nru a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
--- a/drivers/video/console/fbcon.c	2005-01-15 04:25:57 +08:00
+++ b/drivers/video/console/fbcon.c	2005-01-15 08:23:03 +08:00
@@ -2654,13 +2654,13 @@
 		vc = vc_cons[ops->currcon].d;
 
 		if (CON_IS_VISIBLE(vc)) {
-			ops->blank_state = blank;
-
 			if (blank)
 				do_blank_screen(0);
 			else
 				do_unblank_screen(0);
 		}
+		
+		ops->blank_state = blank;
 	}
 }
 




-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt

Re: [PATCH 4/6] fbcon: Save blank state last

[Andrew Morton]

"Antonino A. Daplas" <adaplas@hotpop.com> wrote:
>
> Save blank state after do_blank|unblank_screen() since this flag is checked
> in fbcon_blank().

The code in this area has changed a bit in my tree, probably due to Roman's
cleanups.  I ended up with:

static void fbcon_fb_blanked(struct fb_info *info, int blank)
{
	struct fbcon_ops *ops = info->fbcon_par;
	struct vc_data *vc;

	if (!ops || ops->currcon < 0)
		return;
	vc = vc_cons[ops->currcon].d;
	if (vc->vc_mode == KD_TEXT &&
	    registered_fb[con2fb_map[ops->currcon]] == info &&
	    CON_IS_VISIBLE(vc)) {
		if (blank)
			do_blank_screen(0);
		else
			do_unblank_screen(0);
	}
	ops->blank_state = blank;
}

Please double-check next -mm. make sure that it all landed OK, thanks.


-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt