[FBDEV] Menu cleanups. Added in depenedency needed. More cleanup in fbcon layer.

drivers/video/Kconfig

@@ -38,7 +38,7 @@ config FB
 	  (e.g. an accelerated X server) and that are not frame buffer
 	  device-aware may cause unexpected results. If unsure, say N.
 
-config FB_CLGEN
+config FB_CIRRUS
 	tristate "Cirrus Logic support"
 	depends on FB && (AMIGA || PCI)
 	---help---
@@ -48,7 +48,7 @@ config FB_CLGEN
 	  If you have a PCI-based system, this enables support for these
 	  chips: GD-543x, GD-544x, GD-5480.
 
-	  Please read the file <file:Documentation/fb/clgenfb.txt>.
+	  Please read the file <file:Documentation/fb/cirrusfb.txt>.
 
 	  Say N unless you have such a graphics board or plan to get one
 	  before you next recompile the kernel.
@@ -282,7 +282,7 @@ config FB_S3TRIO
 	  If you have a S3 Trio say Y. Say N for S3 Virge.
 
 config FB_VGA16
-	tristate "VGA 16-color graphics console"
+	tristate "VGA 16-color graphics support"
 	depends on FB && (X86 || PPC)
 	help
 	  This is the frame buffer device driver for VGA 16 color graphic
@@ -329,7 +329,7 @@ config FB_TGA
 	  cards. Say Y if you have one of those.
 
 config FB_VESA
-	bool "VESA VGA graphics console"
+	bool "VESA VGA graphics support"
 	depends on FB && (X86 || X86_64)
 	help
 	  This is the frame buffer device driver for generic VESA 2.0
@@ -343,7 +343,7 @@ config VIDEO_SELECT
 	default y
 
 config FB_HGA
-	tristate "Hercules mono graphics console"
+	tristate "Hercules mono graphics support"
 	depends on FB && X86
 	help
 	  Say Y here if you have a Hercules mono graphics card.
@@ -927,9 +927,13 @@ config FB_VIRTUAL
 	  say M here and read <file:Documentation/modules.txt>.
 
 	  If unsure, say N.
+if VT
+	source "drivers/video/console/Kconfig"
+endif
 
-source "drivers/video/console/Kconfig"
-source "drivers/video/logo/Kconfig"
+if FB || SGI_NEWPORT_CONSOLE
+	source "drivers/video/logo/Kconfig"
+endif
 
 endmenu
 

drivers/video/console/Kconfig

@@ -111,49 +111,8 @@ config PCI_CONSOLE
 	depends on FRAMEBUFFER_CONSOLE
 	default y
 
-config FBCON_ADVANCED
-	bool "Advanced low level driver options"
-	depends on FRAMEBUFFER_CONSOLE
-	---help---
-	  The frame buffer console uses character drawing routines that are
-	  tailored to the specific organization of pixels in the memory of
-	  your graphics hardware. These are called the low level frame buffer
-	  console drivers. Note that they are used for text console output
-	  only; they are NOT needed for graphical applications.
-
-	  If you say N here, the needed low level drivers are automatically
-	  enabled, depending on what frame buffer devices you selected above.
-	  This is recommended for most users.
-
-	  If you say Y here, you have more fine-grained control over which low
-	  level drivers are enabled. You can e.g. leave out low level drivers
-	  for color depths you do not intend to use for text consoles.
-
-	  Low level frame buffer console drivers can be modules ( = code which
-	  can be inserted and removed from the running kernel whenever you
-	  want). The modules will be called fbcon-*. If you want to compile
-	  (some of) them as modules, read <file:Documentation/modules.txt>.
-
-	  If unsure, say N.
-
-# Guess what we need
-
-config FONT_SUN8x16
-	bool "Sparc console 8x16 font"
-	depends on FRAMEBUFFER_CONSOLE && (!SPARC32 && !SPARC64 && FONTS || SPARC32 || SPARC64)
-	help
-	  This is the high resolution console font for Sun machines. Say Y.
-
-config FONT_SUN12x22
-	bool "Sparc console 12x22 font (not supported by all drivers)"
-	depends on FRAMEBUFFER_CONSOLE && (!SPARC32 && !SPARC64 && FONTS || SPARC32 || SPARC64)
-	help
-	  This is the high resolution console font for Sun machines with very
-	  big letters (like the letters used in the SPARC PROM). If the
-	  standard font is unreadable for you, say Y, otherwise say N.
-
 config FONTS
-	bool "Select other fonts" if SPARC32 || SPARC64
+	bool "Select compiled-in fonts"
 	depends on FRAMEBUFFER_CONSOLE
 	help
 	  Say Y here if you would like to use fonts other than the default
@@ -165,10 +124,6 @@ config FONTS
 
 	  If unsure, say N (the default choices are safe).
 
-config FONTS
-	prompt "Select compiled-in fonts"
-	depends on FRAMEBUFFER_CONSOLE && !SPARC32 && !SPARC64
-
 config FONT_8x8
 	bool "VGA 8x8 font" if FONTS
 	depends on FRAMEBUFFER_CONSOLE
@@ -221,5 +176,19 @@ config FONT_MINI_4x6
 	bool "Mini 4x6 font"
 	depends on !SPARC32 && !SPARC64 && FONTS
 
+config FONT_SUN8x16
+	bool "Sparc console 8x16 font"
+	depends on FRAMEBUFFER_CONSOLE && (!SPARC32 && !SPARC64 && FONTS || SPARC32 || SPARC64)
+	help
+	  This is the high resolution console font for Sun machines. Say Y.
+
+config FONT_SUN12x22
+	bool "Sparc console 12x22 font (not supported by all drivers)"
+	depends on FRAMEBUFFER_CONSOLE && (!SPARC32 && !SPARC64 && FONTS || SPARC32 || SPARC64)
+	help
+	  This is the high resolution console font for Sun machines with very
+	  big letters (like the letters used in the SPARC PROM). If the
+	  standard font is unreadable for you, say Y, otherwise say N.
+
 endmenu
 

drivers/video/console/fbcon.c

@@ -302,6 +302,7 @@ static void putcs_unaligned(struct vc_data *vc, struct display *p,
                            struct fb_info *info, struct fb_image *image,
                            int count, const unsigned short *s)
 {
+	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
 	unsigned int width = (vc->vc_font.width + 7)/8;
 	unsigned int cellsize = vc->vc_font.height * width;
 	unsigned int maxcnt = info->pixmap.size/cellsize;
@@ -310,7 +311,6 @@ static void putcs_unaligned(struct vc_data *vc, struct display *p,
 	unsigned int buf_align = info->pixmap.buf_align - 1;
 	unsigned int scan_align = info->pixmap.scan_align - 1;
 	unsigned int idx = vc->vc_font.width/8;
-	unsigned short charmask = p->charmask;
 	u8 mask, *src, *dst, *dst0;
 
 	while (count) {
@@ -350,13 +350,13 @@ static void putcs_aligned(struct vc_data *vc, struct display *p,
                          struct fb_info *info, struct fb_image *image,
                          int count, const unsigned short *s)
 {
+	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
 	unsigned int width = vc->vc_font.width/8;
 	unsigned int cellsize = vc->vc_font.height * width;
 	unsigned int maxcnt = info->pixmap.size/cellsize;
 	unsigned int scan_align = info->pixmap.scan_align - 1;
 	unsigned int buf_align = info->pixmap.buf_align - 1;
 	unsigned int pitch, cnt, size, k;
-	unsigned short charmask = p->charmask;
 	u8 *src, *dst, *dst0;
 
 	while (count) {
@@ -423,13 +423,13 @@ void accel_clear(struct vc_data *vc, struct display *p, int sy,
 static void accel_putc(struct vc_data *vc, struct display *p,
                       int c, int ypos, int xpos)
 {
-	struct fb_image image;
+	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
 	struct fb_info *info = p->fb_info;
-	unsigned short charmask = p->charmask;
 	unsigned int width = (vc->vc_font.width + 7)/8;
 	unsigned int size, pitch;
 	unsigned int scan_align = info->pixmap.scan_align - 1;
 	unsigned int buf_align = info->pixmap.buf_align - 1;
+	struct fb_image image;
 	u8 *src, *dst;
 
 	image.dx = xpos * vc->vc_font.width;
@@ -510,6 +510,7 @@ void accel_clear_margins(struct vc_data *vc, struct display *p,
 
 void accel_cursor(struct vc_data *vc, struct display *p, int flags, int xx, int yy)
 {
+	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
 	static int fgcolor, bgcolor, shape, width, height;
 	static char mask[64], image[64], *dest;
 	struct fb_info *info = p->fb_info;
@@ -538,7 +539,7 @@ void accel_cursor(struct vc_data *vc, struct display *p, int flags, int xx, int
 		bgcolor = (int) attr_bgcol(p, c);
 		cursor.set |= FB_CUR_SETCMAP;
 	}
-	c &= p->charmask;
+	c &= charmask;
 	font = p->fontdata + (c * ((width + 7) / 8) * height);
 	if (font != dest) {
 		dest = font;
@@ -773,7 +774,6 @@ static void fbcon_init(struct vc_data *vc, int init)
 	/* on which frame buffer will we open this console? */
 	info = registered_fb[(int) con2fb_map[unit]];
 	
-	fb_display[unit].can_soft_blank = info->fbops->fb_blank ? 1 : 0;
 	if (info->var.accel_flags)
 		fb_display[unit].scrollmode = SCROLL_YNOMOVE;
 	else
@@ -790,8 +790,6 @@ static void fbcon_deinit(struct vc_data *vc)
 	fbcon_free_font(p);
 }
 
-#define fontwidthvalid(p,w) ((p)->fontwidthmask & FONTWIDTH(w))
-
 static __inline__ void updatescrollmode(struct display *p, struct vc_data *vc)
 {
 	struct fb_info *info = p->fb_info;
@@ -828,12 +826,6 @@ static void fbcon_set_display(struct vc_data *vc, int init, int logo)
 
 	info->var.xoffset = info->var.yoffset = p->yscroll = 0;	/* reset wrap/pan */
 
-	/*
-	 * FIXME: need to set this in order for KDFONTOP ioctl
-	 *        to work
-	 */
-	p->fontwidthmask = FONTWIDTHRANGE(1,16);
-
 	for (i = 0; i < MAX_NR_CONSOLES; i++)
 		if (vc && i != vc->vc_num && fb_display[i].fb_info == info &&
 		    fb_display[i].fontdata)
@@ -844,7 +836,7 @@ static void fbcon_set_display(struct vc_data *vc, int init, int logo)
 		struct display *q = &fb_display[i];
 		struct vc_data *tmp = vc_cons[i].d;
 		
-		if (!fontwidthvalid(p, vc->vc_font.width)) {
+		if (vc->vc_font.width > 32) {
 			/* If we are not the first console on this
 			   fb, copy the font from that console */
 			vc->vc_font.width = tmp->vc_font.width;
@@ -947,14 +939,12 @@ static void fbcon_set_display(struct vc_data *vc, int init, int logo)
 		vc->vc_hi_font_mask = 0;
 		p->fgshift = 8;
 		p->bgshift = 12;
-		p->charmask = 0xff;
 	} else {
 		vc->vc_hi_font_mask = 0x100;
 		if (vc->vc_can_do_color)
 			vc->vc_complement_mask <<= 1;
 		p->fgshift = 9;
 		p->bgshift = 13;
-		p->charmask = 0x1ff;
 	}
 
 	if (!init) {
@@ -1016,7 +1006,7 @@ static void fbcon_set_display(struct vc_data *vc, int init, int logo)
  *
  *	fbcon_bmove_physical_8()    -- These functions fast implementations
  *	fbcon_clear_physical_8()    -- of original fbcon_XXX fns.
- *	fbcon_putc_physical_8()	    -- (fontwidth != 8) may be added later
+ *	fbcon_putc_physical_8()	    -- (font width != 8) may be added later
  *
  *  WARNING:
  *
@@ -1039,10 +1029,11 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height,
 {
 	int unit = vc->vc_num;
 	struct display *p = &fb_display[unit];
+	struct fb_info *info = p->fb_info;
 	u_int y_break;
 	int redraw_cursor = 0;
 
-	if (!p->can_soft_blank && console_blanked)
+	if (!info->fbops->fb_blank && console_blanked)
 		return;
 
 	if (!height || !width)
@@ -1073,9 +1064,10 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height,
 static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos)
 {
 	struct display *p = &fb_display[vc->vc_num];
+	struct fb_info *info = p->fb_info;
 	int redraw_cursor = 0;
 
-	if (!p->can_soft_blank && console_blanked)
+	if (!info->fbops->fb_blank && console_blanked)
 		return;
 
 	if (vt_cons[vc->vc_num]->vc_mode != KD_TEXT)
@@ -1098,9 +1090,10 @@ static void fbcon_putcs(struct vc_data *vc, const unsigned short *s,
 {
 	int unit = vc->vc_num;
 	struct display *p = &fb_display[unit];
+	struct fb_info *info = p->fb_info;
 	int redraw_cursor = 0;
 
-	if (!p->can_soft_blank && console_blanked)
+	if (!info->fbops->fb_blank && console_blanked)
 		return;
 
 	if (vt_cons[unit]->vc_mode != KD_TEXT)
@@ -1466,7 +1459,7 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
 	struct fb_info *info = p->fb_info;
 	int scroll_partial = !(p->scrollmode & __SCROLL_YNOPARTIAL);
 
-	if (!p->can_soft_blank && console_blanked)
+	if (!info->fbops->fb_blank && console_blanked)
 		return 0;
 
 	if (!count || vt_cons[unit]->vc_mode != KD_TEXT)
@@ -1625,8 +1618,9 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
 {
 	int unit = vc->vc_num;
 	struct display *p = &fb_display[unit];
+	struct fb_info *info = p->fb_info;
 	
-	if (!p->can_soft_blank && console_blanked)
+	if (!info->fbops->fb_blank && console_blanked)
 		return;
 
 	if (!width || !height)
@@ -1791,6 +1785,7 @@ static int fbcon_switch(struct vc_data *vc)
 
 static int fbcon_blank(struct vc_data *vc, int blank)
 {
+	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
 	struct display *p = &fb_display[vc->vc_num];
 	struct fb_info *info = p->fb_info;
 
@@ -1799,14 +1794,14 @@ static int fbcon_blank(struct vc_data *vc, int blank)
 
 	fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
 
-	if (!p->can_soft_blank) {
+	if (!info->fbops->fb_blank) {
 		if (blank) {
 			unsigned short oldc;
 			u_int height;
 			u_int y_break;
 
 			oldc = vc->vc_video_erase_char;
-			vc->vc_video_erase_char &= p->charmask;
+			vc->vc_video_erase_char &= charmask;
 			height = vc->vc_rows;
 			y_break = p->vrows - p->yscroll;
 			if (height > y_break) {
@@ -1850,7 +1845,7 @@ static inline int fbcon_get_font(struct vc_data *vc, struct console_font_op *op)
 
 	op->width = vc->vc_font.width;
 	op->height = vc->vc_font.height;
-	op->charcount = (p->charmask == 0x1ff) ? 512 : 256;
+	op->charcount = vc->vc_hi_font_mask ? 512 : 256;
 	if (!op->data)
 		return 0;
 
@@ -1904,7 +1899,7 @@ static int fbcon_do_set_font(struct vc_data *vc, struct console_font_op *op,
 	int cnt;
 	char *old_data = NULL;
 
-	if (!fontwidthvalid(p, w)) {
+	if (!w > 32) {
 		if (userfont && op->op != KD_FONT_OP_COPY)
 			kfree(data - FONT_EXTRA_WORDS * sizeof(int));
 		return -ENXIO;
@@ -1931,7 +1926,6 @@ static int fbcon_do_set_font(struct vc_data *vc, struct console_font_op *op,
 			vc->vc_complement_mask >>= 1;
 		p->fgshift--;
 		p->bgshift--;
-		p->charmask = 0xff;
 
 		/* ++Edmund: reorder the attribute bits */
 		if (vc->vc_can_do_color) {
@@ -1955,7 +1949,6 @@ static int fbcon_do_set_font(struct vc_data *vc, struct console_font_op *op,
 			vc->vc_complement_mask <<= 1;
 		p->fgshift++;
 		p->bgshift++;
-		p->charmask = 0x1ff;
 
 		/* ++Edmund: reorder the attribute bits */
 		{
@@ -2177,7 +2170,7 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
 	u8 val;
 
 	if (!vc->vc_can_do_color
-	    || (!p->can_soft_blank && console_blanked))
+	    || (!info->fbops->fb_blank && console_blanked))
 		return -EINVAL;
 	for (i = j = 0; i < 16; i++) {
 		k = table[i];
@@ -2336,7 +2329,7 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)
 	if (scrollback_current == scrollback_old)
 		return 0;
 
-	if (!p->can_soft_blank &&
+	if (!info->fbops->fb_blank &&
 	    (console_blanked || vt_cons[unit]->vc_mode != KD_TEXT
 	     || !lines))
 		return 0;

drivers/video/console/fbcon.h

@@ -25,10 +25,7 @@
 
 struct display {
     /* Filled in by the frame buffer device */
-    u_short can_soft_blank;         /* zero if no hardware blanking */
     u_short inverse;                /* != 0 text black on white as default */
-    struct display_switch *dispsw;  /* low level operations */
-
     /* Filled in by the low-level console driver */
     struct fb_info *fb_info;        /* frame buffer for this console */
     int vrows;                      /* number of virtual rows */
@@ -41,20 +38,12 @@ struct display {
     u_short scrollmode;             /* Scroll Method */
     short yscroll;                  /* Hardware scrolling */
     unsigned char fgshift, bgshift;
-    unsigned short charmask;        /* 0xff or 0x1ff */
-    unsigned int fontwidthmask;      /* 1 at (1 << (width - 1)) if width is supported */
 };
 
 /* drivers/video/console/fbcon.c */
-extern struct display fb_display[MAX_NR_CONSOLES];
 extern char con2fb_map[MAX_NR_CONSOLES];
 extern void set_con2fb_map(int unit, int newidx);
 
-/* fontwidth w is supported by dispsw */
-#define FONTWIDTH(w)	(1 << ((w) - 1))
-/* fontwidths w1-w2 inclusive are supported by dispsw */
-#define FONTWIDTHRANGE(w1,w2)	(FONTWIDTH(w2+1) - FONTWIDTH(w1))
-
     /*
      *  Attribute Decoding
      */

include/linux/fb.h

@@ -343,6 +343,7 @@ struct fb_pixmap {
 	u8   (*inbuf) (u8 *addr);
 	unsigned long lock_flags;         /* flags for locking             */
 	spinlock_t lock;                  /* spinlock                      */
+	atomic_t count;
 };
 #ifdef __KERNEL__