patch-2.3.21 linux/drivers/video/fbmem.c

• Lines: 30
• Date: Mon Oct 11 13:53:09 1999
• Orig file: v2.3.20/linux/drivers/video/fbmem.c
• Orig date: Tue Aug 31 17:29:14 1999

diff -u --recursive --new-file v2.3.20/linux/drivers/video/fbmem.c linux/drivers/video/fbmem.c
@@ -100,12 +100,17 @@
 extern int q40fb_init(void);
 extern int sgivwfb_init(void);
 extern int sgivwfb_setup(char*);
+extern int tdfxfb_init(void);
+extern int tdfxfb_setup(char*);
 
 static struct {
 	const char *name;
 	int (*init)(void);
 	int (*setup)(char*);
 } fb_drivers[] __initdata = {
+#ifdef CONFIG_FB_3DFX
+	{ "tdfx", tdfxfb_init, tdfxfb_setup },
+#endif
 #ifdef CONFIG_FB_SGIVW
 	{ "sgivw", sgivwfb_init, sgivwfb_setup },
 #endif
@@ -453,6 +458,11 @@
 		    /* set them all */
 		    for (i = 0; i < MAX_NR_CONSOLES; i++)
 			set_con2fb_map(i, con2fb.framebuffer);
+		return 0;
+	case FBIOBLANK:
+		if (info->blank == 0)
+			return -EINVAL;
+		(*info->blank)(arg, info);
 		return 0;
 	default:
 		return fb->fb_ioctl(inode, file, cmd, arg, PROC_CONSOLE(info),