[PATCH] restore framebuffer console after suspend

[PATCH] restore framebuffer console after suspend

[Carl-Daniel Hailfinger]

[-- Attachment #1: Type: text/plain, Size: 430 bytes --]

Marcelo,

this patch fixes the case when a laptop was suspended and resumed while a 
framebuffer console was active, the console would not be redrawn.

After a discussion with Benjamin Herrenschmidt, we both agree that this 
patch is the best solution. It is the same as my first patch with this 
subject, just resent because there was some confusion about which patch was 
best.

Please apply for 2.4.20-rc2.

Thanks
Carl-Daniel

[-- Attachment #2: patch-fbdev.txt --]
[-- Type: text/plain, Size: 461 bytes --]

diff -Naur linux.orig/drivers/video/fbcon.c linux/drivers/video/fbcon.c
--- linux.orig/drivers/video/fbcon.c	Thu Sep 12 17:22:35 2002
+++ linux/drivers/video/fbcon.c	Fri Nov  8 13:09:41 2002
@@ -1571,10 +1571,6 @@ static int fbcon_blank(struct vc_data *c
 
     if (blank < 0)	/* Entering graphics mode */
 	return 0;
-#ifdef CONFIG_PM
-    if (fbcon_sleeping)
-    	return 0;
-#endif /* CONFIG_PM */
 
     fbcon_cursor(p->conp, blank ? CM_ERASE : CM_DRAW);
 

Re: [PATCH] restore framebuffer console after suspend

[Carl-Daniel Hailfinger]

[-- Attachment #1: Type: text/plain, Size: 272 bytes --]

Marcelo,

please disregard my previous patch as it is needlessly invasive. I'm 
currently evaluating a smaller patch (attached) which does not require an 
audit of the low-level drivers and still fixes my problem.

Ben, can you please comment on this?

Thanks
Carl-Daniel

[-- Attachment #2: patch-fbdev.txt --]
[-- Type: text/plain, Size: 407 bytes --]

===== drivers/video/fbcon.c 1.12 vs edited =====
--- 1.12/drivers/video/fbcon.c	Thu Sep 12 17:22:35 2002
+++ edited/drivers/video/fbcon.c	Sat Nov  9 02:57:00 2002
@@ -1573,7 +1573,7 @@ static int fbcon_blank(struct vc_data *c
 	return 0;
 #ifdef CONFIG_PM
     if (fbcon_sleeping)
-    	return 0;
+    	return blank ? 0 : 1;
 #endif /* CONFIG_PM */
 
     fbcon_cursor(p->conp, blank ? CM_ERASE : CM_DRAW);

[PATCH] restore framebuffer console after suspend

[Carl-Daniel Hailfinger]

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

This patch fixes the problem where the current framebuffer console is not 
restored after a system suspend and subsequent resume.

Benjamin Herrenschmidt approved this patch in thread "Re: Linux 2.4.20-rc1"

Please apply for 2.4.20-rc2.

Thanks
Carl-Daniel

[-- Attachment #2: patch-fbdev.txt --]
[-- Type: text/plain, Size: 461 bytes --]

diff -Naur linux.orig/drivers/video/fbcon.c linux/drivers/video/fbcon.c
--- linux.orig/drivers/video/fbcon.c	Thu Sep 12 17:22:35 2002
+++ linux/drivers/video/fbcon.c	Fri Nov  8 13:09:41 2002
@@ -1571,10 +1571,6 @@ static int fbcon_blank(struct vc_data *c
 
     if (blank < 0)	/* Entering graphics mode */
 	return 0;
-#ifdef CONFIG_PM
-    if (fbcon_sleeping)
-    	return 0;
-#endif /* CONFIG_PM */
 
     fbcon_cursor(p->conp, blank ? CM_ERASE : CM_DRAW);