restore framebuffer console after suspend

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

diff -Naur linux.orig/drivers/video/fbcon.c linux/drivers/video/fbcon.c
@@ -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);
 

I have the 2.5.46 make working up to the errors below. I am doing this so I can test with the new epoll features. To get this far, all I had to do was apply a patch I found in the 2.5.45-ac1 tree (to address some errors in net/ipv4/ipmr.c). Do I need to disable LLC? Or enable something so LLC gets included in the make? Is there a more stable release that includes the epoll support? I am running RedHat 7.3. Any help is greatly appreciated.

- Mark

        ld -m elf_i386 -e stext -T arch/i386/vmlinux.lds.s

arch/i386/kernel/head.o arch/i386/kernel/init_task.o
init/built-in.o --start-group usr/built-in.o arch/i386/kernel/built-in.o
arch/i386/mm/built-in.o arch/i386/mach-generic/built-in.o kernel/built-in.o mm/built-in.o fs/built-in.o ipc/built-in.o security/built-in.o crypto/built-in.o lib/lib.a arch/i386/lib/lib.a drivers/built-in.o sound/built-in.o arch/i386/pci/built-in.o net/built-in.o --end-group -o .tmp_vmlinux1
net/built-in.o: In function `p8022_request':
net/built-in.o(.text+0xe56b): undefined reference to `llc_build_and_send_ui_pkt'
net/built-in.o: In function `register_8022_client':
net/built-in.o(.text+0xe5bd): undefined reference to llc_sap_open' net/built-in.o: In function unregister_8022_client':
net/built-in.o(.text+0xe5ea): undefined reference to llc_sap_close' net/built-in.o: In function snap_request':
net/built-in.o(.text+0xe736): undefined reference to `llc_build_and_send_ui_pkt'
net/built-in.o: In function `snap_init':
net/built-in.o(.init.text+0x55b): undefined reference to `llc_sap_open'
make: *** [.tmp_vmlinux1] Error 1

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

===== drivers/video/fbcon.c 1.12 vs edited =====

@@ -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);