The last of the console code inside the frmaebuffer layer. I also moved all...

The last of the console code inside the frmaebuffer layer. I also moved all the graphics related code into the drivers/video directory.

Makefile

@@ -670,7 +670,7 @@ CLEAN_FILES += \
 	vmlinux System.map \
 	drivers/char/consolemap_deftbl.c drivers/video/console/promcon_tbl.c \
 	drivers/char/conmakehash \
-	drivers/char/drm/*-mod.c \
+	drivers/video/drm/*-mod.c \
 	drivers/char/defkeymap.c drivers/char/qtronixmap.c \
 	drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist \
 	drivers/zorro/devlist.h drivers/zorro/gen-devlist \

drivers/char/Config.in

@@ -184,9 +184,6 @@ if [ "$CONFIG_FTAPE" != "n" ]; then
 fi
 endmenu
 
-source drivers/char/agp/Config.in
-source drivers/char/drm/Config.in
-
 if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
    source drivers/char/pcmcia/Config.in
 fi

drivers/char/Makefile

@@ -100,8 +100,6 @@ obj-$(CONFIG_SH_WDT) += shwdt.o
 obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
 obj-$(CONFIG_MWAVE) += mwave/
-obj-$(CONFIG_AGP) += agp/
-obj-$(CONFIG_DRM) += drm/
 obj-$(CONFIG_PCMCIA) += pcmcia/
 
 include $(TOPDIR)/Rules.make

drivers/video/Config.in

@@ -5,6 +5,9 @@
 mainmenu_option next_comment
 comment 'Graphics support'
 
+source drivers/video/agp/Config.in
+source drivers/video/drm/Config.in
+
 bool 'Support for frame buffer devices ' CONFIG_FB
 
 if [ "$CONFIG_FB" = "y" ]; then

drivers/video/Makefile

@@ -9,6 +9,9 @@ export-objs    	:= fbmem.o fbcmap.o fbmon.o modedb.o fbgen.o cyber2000fb.o
 
 # Each configuration option enables a list of files.
 
+obj-$(CONFIG_AGP)		  += agp/
+obj-$(CONFIG_DRM) 		  += drm/
+
 # Add fbmon.o back into obj-$(CONFIG_FB) in 2.5.x
 obj-$(CONFIG_FB)                  += fbmem.o fbcmap.o modedb.o fbgen.o
 # Only include macmodes.o if we have FB support and are PPC

drivers/video/anakinfb.c

@@ -78,7 +78,6 @@ anakinfb_init(void)
 	fb_info.fbops = &anakinfb_ops;
 	fb_info.var = anakinfb_var;
 	fb_info.fix = anakinfb_fix;
-	strcpy(fb_info.fontname, "VGA8x16");
 	if (!(request_mem_region(VGA_START, VGA_SIZE, "vga")))
 		return -ENOMEM;
 	if (fb_info.screen_base = ioremap(VGA_START, VGA_SIZE)) {

drivers/video/aty/atyfb_base.c

@@ -214,7 +214,6 @@ static struct fb_ops atyfb_ops = {
 	.fb_rasterimg	= atyfb_rasterimg,
 };
 
-static char fontname[40] __initdata = { 0 };
 static char curblink __initdata = 1;
 static char noaccel __initdata = 0;
 static u32 default_vram __initdata = 0;
@@ -1822,7 +1821,6 @@ static int __init aty_init(struct fb_info *info, const char *name)
 	info->node = NODEV;
 	info->fbops = &atyfb_ops;
 	info->pseudo_palette = pseudo_palette;
-	strcpy(info->fontname, fontname);
 	info->flags = FBINFO_FLAG_DEFAULT;
 
 #ifdef CONFIG_PMAC_BACKLIGHT
@@ -2415,17 +2413,7 @@ int __init atyfb_setup(char *options)
 		return 0;
 
 	while ((this_opt = strsep(&options, ",")) != NULL) {
-		if (!strncmp(this_opt, "font:", 5)) {
-			char *p;
-			int i;
-
-			p = this_opt + 5;
-			for (i = 0; i < sizeof(fontname) - 1; i++)
-				if (!*p || *p == ' ' || *p == ',')
-					break;
-			memcpy(fontname, this_opt + 5, i);
-			fontname[i] = 0;
-		} else if (!strncmp(this_opt, "noblink", 7)) {
+		if (!strncmp(this_opt, "noblink", 7)) {
 			curblink = 0;
 		} else if (!strncmp(this_opt, "noaccel", 7)) {
 			noaccel = 1;

drivers/video/clps711xfb.c

@@ -27,8 +27,6 @@
 #include <linux/proc_fs.h>
 #include <linux/delay.h>
 
-#include <video/fbcon.h>
-
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/uaccess.h>
@@ -368,20 +366,16 @@ int __init clps711xfb_init(void)
 {
 	int err = -ENOMEM;
 
-	cfb = kmalloc(sizeof(*cfb) + sizeof(struct display), GFP_KERNEL);
+	cfb = kmalloc(sizeof(*cfb), GFP_KERNEL);
 	if (!cfb)
 		goto out;
 
-	memset(cfb, 0, sizeof(*cfb) + sizeof(struct display));
+	memset(cfb, 0, sizeof(*cfb));
 	strcpy(cfb->fix.id, "clps711x");
 
 	cfb->currcon		= -1;
 	cfb->fbops		= &clps7111fb_ops;
-	cfb->changevar		= NULL;
-	cfb->switch_con		= gen_switch;
-	cfb->updatevar		= gen_update_var;
 	cfb->flags		= FBINFO_FLAG_DEFAULT;
-	cfb->disp		= (struct display *)(cfb + 1);
 
 	clps711x_guess_lcd_params(cfb);
 
@@ -422,7 +416,6 @@ int __init clps711xfb_init(void)
 		clps_writeb(clps_readb(PDDR) | EDB_PD3_LCDBL, PDDR);
 	}
 
-	gen_set_var(&cfb->var, -1, cfb);
 	err = register_framebuffer(cfb);
 
 out:	return err;

drivers/video/console/Config.in

@@ -18,17 +18,15 @@ if [ "$CONFIG_VT" != "n" ]; then
 #     fi
    fi
    tristate 'MDA text console (dual-headed) ' CONFIG_MDA_CONSOLE
-   if [ "$CONFIG_FB" = "y" ]; then
-      define_bool CONFIG_PCI_CONSOLE y
+   if [ "$CONFIG_SGI_IP22" = "y" ]; then
+      tristate 'SGI Newport Console support' CONFIG_SGI_NEWPORT_CONSOLE
+      if [ "$CONFIG_SGI_NEWPORT_CONSOLE" != "y" ]; then
+         define_bool CONFIG_DUMMY_CONSOLE y
+      else
+         define_bool CONFIG_FONT_8x16 y
+      fi
    fi
-#if [ "$CONFIG_SGI_IP22" = "y" ]; then
-#   tristate 'SGI Newport Console support' CONFIG_SGI_NEWPORT_CONSOLE
-#   if [ "$CONFIG_SGI_NEWPORT_CONSOLE" != "y" ]; then
-#      define_bool CONFIG_DUMMY_CONSOLE y
-#   else
-#      define_bool CONFIG_FONT_8x16 y
-#fi
-   if [ "$CONFIG_ARCH_PARISC" = "y" ]; then
+   if [ "$CONFIG_PARISC" = "y" ]; then
 #     bool 'IODC console' CONFIG_IODC_CONSOLE
       bool 'STI console' CONFIG_STI_CONSOLE
       if [ "$CONFIG_IODC_CONSOLE" = "n" ]; then
@@ -50,6 +48,7 @@ if [ "$CONFIG_VT" != "n" ]; then
       bool 'Framebuffer Console support' CONFIG_FRAMEBUFFER_CONSOLE
       if [ "$CONFIG_FRAMEBUFFER_CONSOLE" = "y" ]; then
          define_bool CONFIG_DUMMY_CONSOLE y	
+         define_bool CONFIG_PCI_CONSOLE y
          bool '  Advanced low level driver options' CONFIG_FBCON_ADVANCED
          if [ "$CONFIG_FBCON_ADVANCED" = "y" ]; then
             tristate '    Hardware acceleration support' CONFIG_FBCON_ACCEL

drivers/video/console/fbcon.c

@@ -243,6 +243,24 @@ static void cursor_timer_handler(unsigned long dev_addr)
       add_timer(&cursor_timer);
 }
 
+static int __init fbconsole_setup(char *options)
+{
+    char *this_opt;
+    int unit;
+
+    if (!options || !*options)
+            return 0;
+
+    while ((this_opt = strsep(&options, ",")) != NULL) {
+        if (!strncmp(this_opt, "font:", 5)) {
+                for (unit = 0; unit < MAX_NR_CONSOLES; unit++)
+                		strcpy(fb_display[unit].fontname, this_opt+5);
+	}
+    }
+    return 0;
+}
+
+__setup("fbcon=", fbconsole_setup);
 
 /**
  *	PROC_CONSOLE - find the attached tty or visible console
@@ -653,8 +671,8 @@ static void fbcon_setup(int con, int init, int logo)
     }
 
     if (!p->fontdata) {
-        if (!info->fontname[0] ||
-	    !(font = fbcon_find_font(info->fontname)))
+        if (!p->fontname[0] ||
+	    !(font = fbcon_find_font(p->fontname)))
 	        font = fbcon_get_default_font(info->var.xres, info->var.yres);
         p->_fontwidth = font->width;
         p->_fontheight = font->height;
@@ -1605,7 +1623,6 @@ static int fbcon_switch(struct vc_data *conp)
     return 1;
 }
 
-
 static int fbcon_blank(struct vc_data *conp, int blank)
 {
     struct display *p = &fb_display[conp->vc_num];
@@ -1619,10 +1636,12 @@ static int fbcon_blank(struct vc_data *conp, int blank)
     if (!p->can_soft_blank) {
 	if (blank) {
 	    if (info->fix.visual == FB_VISUAL_MONO01) {
+		/*
 		if (info->screen_base)
 		    fb_memset255(info->screen_base,
 				 info->var.xres_virtual*info->var.yres_virtual*
 				 info->var.bits_per_pixel>>3);
+		*/
 	    } else {
 	    	unsigned short oldc;
 	    	u_int height;

drivers/video/dnfb.c

@@ -233,7 +233,6 @@ unsigned long __init dnfb_init(unsigned long mem_start)
 {
 	int err;
 
-	fb_info.fontname[0] = 0;
 	fb_info.node = NODEV;
 	fb_info.fbops = &dn_fb_ops;
 	fb_info.fix = dnfb_fix;