diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/Config.in | 9 | ||||
-rw-r--r-- | drivers/video/Makefile | 11 | ||||
-rw-r--r-- | drivers/video/fbcmap.c | 45 | ||||
-rw-r--r-- | drivers/video/fbcon-hga.c | 245 | ||||
-rw-r--r-- | drivers/video/fbcon.c | 8 | ||||
-rw-r--r-- | drivers/video/fbmem.c | 5 | ||||
-rw-r--r-- | drivers/video/hgafb.c | 762 | ||||
-rw-r--r-- | drivers/video/riva/fbdev.c | 4 | ||||
-rw-r--r-- | drivers/video/vesafb.c | 8 | ||||
-rw-r--r-- | drivers/video/vgacon.c | 80 |
10 files changed, 1146 insertions, 31 deletions
diff --git a/drivers/video/Config.in b/drivers/video/Config.in index 850755767..4de32c098 100644 --- a/drivers/video/Config.in +++ b/drivers/video/Config.in @@ -85,6 +85,7 @@ if [ "$CONFIG_FB" = "y" ]; then if [ "$ARCH" = "i386" ]; then bool ' VESA VGA graphics console' CONFIG_FB_VESA tristate ' VGA 16-color graphics console' CONFIG_FB_VGA16 + tristate ' Hercules mono graphics console (EXPERIMENTAL)' CONFIG_FB_HGA define_bool CONFIG_VIDEO_SELECT y fi if [ "$CONFIG_VISWS" = "y" ]; then @@ -173,6 +174,7 @@ if [ "$CONFIG_FB" = "y" ]; then tristate ' Mac variable bpp packed pixels support' CONFIG_FBCON_MAC tristate ' VGA 16-color planar support' CONFIG_FBCON_VGA_PLANES tristate ' VGA characters/attributes support' CONFIG_FBCON_VGA + tristate ' HGA monochrome support (EXPERIMENTAL)' CONFIG_FBCON_HGA else # Guess what we need if [ "$CONFIG_FB_ACORN" = "y" -o "$CONFIG_FB_AMIGA" = "y" -o \ @@ -331,6 +333,13 @@ if [ "$CONFIG_FB" = "y" ]; then define_tristate CONFIG_FBCON_VGA_PLANES m fi fi + if [ "$CONFIG_FB_HGA" = "y" ]; then + define_tristate CONFIG_FBCON_HGA y + else + if [ "$CONFIG_FB_HGA" = "m" ]; then + define_tristate CONFIG_FBCON_HGA m + fi + fi fi bool ' Support only 8 pixels wide fonts' CONFIG_FBCON_FONTWIDTH8_ONLY if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 0f8b53c3f..c3d442e22 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -21,7 +21,7 @@ export-objs := fbmem.o fbcmap.o fbcon.o fbcon-afb.o fbcon-ilbm.o \ fbcon-iplan2p8.o fbcon-vga-planes.o fbcon-cfb16.o \ fbcon-cfb2.o fbcon-cfb24.o fbcon-cfb32.o fbcon-cfb4.o \ fbcon-cfb8.o fbcon-mac.o fbcon-mfb.o fbcon-vga8-planes.o \ - matrox/matroxfb.o cyber2000fb.o + matrox/matroxfb.o cyber2000fb.o fbcon-hga.o # Object file lists. obj-y := @@ -85,9 +85,6 @@ obj-$(CONFIG_FB_TCX) += tcxfb.o sbusfb.o obj-$(CONFIG_FB_CGFOURTEEN) += cgfourteenfb.o sbusfb.o obj-$(CONFIG_FB_P9100) += p9100fb.o sbusfb.o obj-$(CONFIG_FB_LEO) += leofb.o sbusfb.o -obj-$(CONFIG_FB_SUN3) += sun3fb.o -obj-$(CONFIG_FB_BWTWO) += bwtwofb.o -obj-$(CONFIG_FB_VIRTUAL) += vfb.o ifeq ($(CONFIG_FB_MATROX),y) SUB_DIRS += matrox @@ -109,6 +106,11 @@ else endif endif +obj-$(CONFIG_FB_SUN3) += sun3fb.o +obj-$(CONFIG_FB_BWTWO) += bwtwofb.o +obj-$(CONFIG_FB_HGA) += hgafb.o +obj-$(CONFIG_FB_VIRTUAL) += vfb.o + # Generic Low Level Drivers obj-$(CONFIG_FBCON_AFB) += fbcon-afb.o @@ -126,6 +128,7 @@ obj-$(CONFIG_FBCON_IPLAN2P16) += fbcon-iplan2p16.o obj-$(CONFIG_FBCON_MAC) += fbcon-mac.o obj-$(CONFIG_FBCON_MFB) += fbcon-mfb.o obj-$(CONFIG_FBCON_VGA) += fbcon-vga.o +obj-$(CONFIG_FBCON_HGA) += fbcon-hga.o # Extract lists of the multi-part drivers. # The 'int-*' lists are the intermediate files used to build the multi's. diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c index 9207df06e..264cf14a7 100644 --- a/drivers/video/fbcmap.c +++ b/drivers/video/fbcmap.c @@ -16,22 +16,6 @@ #include <asm/uaccess.h> - -static void memcpy_fs(int fsfromto, void *to, void *from, int len) -{ - switch (fsfromto) { - case 0: - memcpy(to, from, len); - return; - case 1: - copy_from_user(to, from, len); - return; - case 2: - copy_to_user(to, from, len); - return; - } -} - static u16 red2[] = { 0x0000, 0xaaaa }; @@ -148,11 +132,30 @@ void fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to, int fsfromto) if (size < 0) return; size *= sizeof(u16); - memcpy_fs(fsfromto, to->red+tooff, from->red+fromoff, size); - memcpy_fs(fsfromto, to->green+tooff, from->green+fromoff, size); - memcpy_fs(fsfromto, to->blue+tooff, from->blue+fromoff, size); - if (from->transp && to->transp) - memcpy_fs(fsfromto, to->transp+tooff, from->transp+fromoff, size); + + switch (fsfromto) { + case 0: + memcpy(to->red+tooff, from->red+fromoff, size); + memcpy(to->green+tooff, from->green+fromoff, size); + memcpy(to->blue+tooff, from->blue+fromoff, size); + if (from->transp && to->transp) + memcpy(to->transp+tooff, from->transp+fromoff, size); + break; + case 1: + copy_from_user(to->red+tooff, from->red+fromoff, size); + copy_from_user(to->green+tooff, from->green+fromoff, size); + copy_from_user(to->blue+tooff, from->blue+fromoff, size); + if (from->transp && to->transp) + copy_from_user(to->transp+tooff, from->transp+fromoff, size); + break; + case 2: + copy_to_user(to->red+tooff, from->red+fromoff, size); + copy_to_user(to->green+tooff, from->green+fromoff, size); + copy_to_user(to->blue+tooff, from->blue+fromoff, size); + if (from->transp && to->transp) + copy_to_user(to->transp+tooff, from->transp+fromoff, size); + break; + } } diff --git a/drivers/video/fbcon-hga.c b/drivers/video/fbcon-hga.c new file mode 100644 index 000000000..384e0a917 --- /dev/null +++ b/drivers/video/fbcon-hga.c @@ -0,0 +1,245 @@ +/* + * linux/drivers/video/fbcon-hga.c -- Low level frame buffer operations for + * the Hercules graphics adaptor + * + * Created 25 Nov 1999 by Ferenc Bakonyi (fero@drama.obuda.kando.hu) + * Based on fbcon-mfb.c by Geert Uytterhoeven + * + * History: + * + * - Revision 0.1.0 (6 Dec 1999): comment changes + * - First release (25 Nov 1999) + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +#include <linux/module.h> +#include <linux/tty.h> +#include <linux/console.h> +#include <linux/string.h> +#include <linux/fb.h> + +#include <video/fbcon.h> +#include <video/fbcon-hga.h> + +#if 0 +#define DPRINTK(args...) printk(KERN_DEBUG __FILE__": " ##args) +#else +#define DPRINTK(args...) +#endif + +#define HGA_ROWADDR(row) ((row%4)*8192 + (row>>2)*90) + + /* + * Hercules monochrome + */ + +static inline u8* rowaddr(struct display *p, u_int row) +{ + return p->screen_base + HGA_ROWADDR(row); +} + +void fbcon_hga_setup(struct display *p) +{ + DPRINTK("fbcon_hga_setup: ll:%d\n", (int)p->line_length); + + p->next_line = p->line_length; + p->next_plane = 0; +} + +void fbcon_hga_bmove(struct display *p, int sy, int sx, int dy, int dx, + int height, int width) +{ + u8 *src, *dest; + u_int rows, y1, y2; + +#if 0 + if (sx == 0 && dx == 0 && width == p->next_line) { + src = p->screen_base+sy*fontheight(p)*width; + dest = p->screen_base+dy*fontheight(p)*width; + fb_memmove(dest, src, height*fontheight(p)*width); + } else +#endif + if (dy <= sy) { + y1 = sy*fontheight(p); + y2 = dy*fontheight(p); + for (rows = height*fontheight(p); rows--; ) { + src = rowaddr(p, y1)+sx; + dest = rowaddr(p, y2)+dx; + fb_memmove(dest, src, width); + y1++; + y2++; + } + } else { + y1 = (sy+height)*fontheight(p)-1; + y2 = (dy+height)*fontheight(p)-1; + for (rows = height*fontheight(p); rows--;) { + src = rowaddr(p, y1)+sx; + dest = rowaddr(p, y2)+dx; + fb_memmove(dest, src, width); + y1--; + y2--; + } + } +} + +void fbcon_hga_clear(struct vc_data *conp, struct display *p, int sy, int sx, + int height, int width) +{ + u8 *dest; + u_int rows, y; + int inverse = conp ? attr_reverse(p,conp->vc_video_erase_char) : 0; + + DPRINTK("fbcon_hga_clear: sx:%d, sy:%d, height:%d, width:%d\n", sx, sy, height, width); + + y = sy*fontheight(p); +#if 0 + if (sx == 0 && width == p->next_line) { + if (inverse) { + fb_memset255(dest, height*fontheight(p)*width); + } else { + fb_memclear(dest, height*fontheight(p)*width); + } + } else +#endif + for (rows = height*fontheight(p); rows--; y++) { + dest = rowaddr(p, y)+sx; + if (inverse) { + fb_memset255(dest, width); + } else { + fb_memclear(dest, width); + } + } +} + +void fbcon_hga_putc(struct vc_data *conp, struct display *p, int c, int yy, + int xx) +{ + u8 *dest, *cdat; + u_int rows, y, bold, revs, underl; + u8 d; + + cdat = p->fontdata+(c&p->charmask)*fontheight(p); + bold = attr_bold(p, c); + revs = attr_reverse(p, c); + underl = attr_underline(p, c); + y = yy*fontheight(p); + + for (rows = fontheight(p); rows--; y++) { + d = *cdat++; + if (underl && !rows) + d = 0xff; + else if (bold) + d |= d>>1; + if (revs) + d = ~d; + dest = rowaddr(p, y)+xx; + *dest = d; + } +} + +void fbcon_hga_putcs(struct vc_data *conp, struct display *p, + const unsigned short *s, int count, int yy, int xx) +{ + u8 *dest, *cdat; + u_int rows, y, y0, bold, revs, underl; + u8 d; + u16 c; + + bold = attr_bold(p,scr_readw(s)); + revs = attr_reverse(p,scr_readw(s)); + underl = attr_underline(p,scr_readw(s)); + y0 = yy*fontheight(p); + + while (count--) { + c = scr_readw(s++) & p->charmask; + cdat = p->fontdata+c*fontheight(p); + y = y0; + for (rows = fontheight(p); rows--; y++) { + d = *cdat++; + if (underl && !rows) + d = 0xff; + else if (bold) + d |= d>>1; + if (revs) + d = ~d; + dest = rowaddr(p, y)+xx; + *dest = d; + } + xx++; + } +} + +void fbcon_hga_revc(struct display *p, int xx, int yy) +{ + u8 *dest; + u_int rows, y; + + y = yy*fontheight(p); + for (rows = fontheight(p); rows--; y++) { + dest = rowaddr(p, y)+xx; + *dest = ~*dest; + } +} + +void fbcon_hga_clear_margins(struct vc_data *conp, struct display *p, + int bottom_only) +{ + u8 *dest; + u_int height, y; + int inverse = conp ? attr_reverse(p,conp->vc_video_erase_char) : 0; + + DPRINTK("fbcon_hga_clear_margins: enter\n"); + + /* No need to handle right margin. */ + + y = conp->vc_rows * fontheight(p); + for (height = p->var.yres - y; height-- > 0; y++) { + DPRINTK("fbcon_hga_clear_margins: y:%d, height:%d\n", y, height); + dest = rowaddr(p, y); + if (inverse) { + fb_memset255(dest, p->next_line); + } else { + fb_memclear(dest, p->next_line); + } + } +} + + + /* + * `switch' for the low level operations + */ + +struct display_switch fbcon_hga = { + fbcon_hga_setup, fbcon_hga_bmove, fbcon_hga_clear, fbcon_hga_putc, + fbcon_hga_putcs, fbcon_hga_revc, NULL, NULL, fbcon_hga_clear_margins, + FONTWIDTH(8) +}; + + +#ifdef MODULE +int init_module(void) +{ + return 0; +} + +void cleanup_module(void) +{ +} +#endif /* MODULE */ + + + /* + * Visible symbols for modules + */ + +EXPORT_SYMBOL(fbcon_hga); +EXPORT_SYMBOL(fbcon_hga_setup); +EXPORT_SYMBOL(fbcon_hga_bmove); +EXPORT_SYMBOL(fbcon_hga_clear); +EXPORT_SYMBOL(fbcon_hga_putc); +EXPORT_SYMBOL(fbcon_hga_putcs); +EXPORT_SYMBOL(fbcon_hga_revc); +EXPORT_SYMBOL(fbcon_hga_clear_margins); diff --git a/drivers/video/fbcon.c b/drivers/video/fbcon.c index 02f50a497..aedbc8b17 100644 --- a/drivers/video/fbcon.c +++ b/drivers/video/fbcon.c @@ -2301,7 +2301,7 @@ static int __init fbcon_show_logo( void ) } #endif #if defined(CONFIG_FBCON_MFB) || defined(CONFIG_FBCON_AFB) || \ - defined(CONFIG_FBCON_ILBM) + defined(CONFIG_FBCON_ILBM) || defined(CONFIG_FBCON_HGA) if (depth == 1 && (p->type == FB_TYPE_PACKED_PIXELS || p->type == FB_TYPE_PLANES || @@ -2311,10 +2311,14 @@ static int __init fbcon_show_logo( void ) unsigned char inverse = p->inverse || p->visual == FB_VISUAL_MONO01 ? 0x00 : 0xff; + int is_hga = !strncmp(p->fb_info->modename, "HGA", 3); /* can't use simply memcpy because need to apply inverse */ for( y1 = 0; y1 < LOGO_H; y1++ ) { src = logo + y1*LOGO_LINE; - dst = fb + y1*line + x/8; + if (is_hga) + dst = fb + (y1%4)*8192 + (y1>>2)*line + x/8; + else + dst = fb + y1*line + x/8; for( x1 = 0; x1 < LOGO_LINE; ++x1 ) fb_writeb(fb_readb(src++) ^ inverse, dst++); } diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 740e23860..3bbf334b0 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -85,6 +85,8 @@ extern int vesafb_init(void); extern int vesafb_setup(char*); extern int vga16fb_init(void); extern int vga16fb_setup(char*); +extern int hgafb_init(void); +extern int hgafb_setup(char*); extern int matroxfb_init(void); extern int matroxfb_setup(char*); extern int hpfb_init(void); @@ -196,6 +198,9 @@ static struct { #ifdef CONFIG_FB_VGA16 { "vga16", vga16fb_init, vga16fb_setup }, #endif +#ifdef CONFIG_FB_HGA + { "hga", hgafb_init, hgafb_setup }, +#endif #ifdef CONFIG_FB_MATROX { "matrox", matroxfb_init, matroxfb_setup }, #endif diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c new file mode 100644 index 000000000..bffa6b02e --- /dev/null +++ b/drivers/video/hgafb.c @@ -0,0 +1,762 @@ +/* + * linux/drivers/video/hgafb.c -- Hercules graphics adaptor frame buffer device + * + * Created 25 Nov 1999 by Ferenc Bakonyi (fero@drama.obuda.kando.hu) + * Based on skeletonfb.c by Geert Uytterhoeven and + * mdacon.c by Andrew Apted + * + * History: + * + * - Revision 0.1.4 (24 Jan 2000): fixed a bug in hga_card_detect() for + * HGA-only systems + * - Revision 0.1.3 (22 Jan 2000): modified for the new fb_info structure + * screen is cleared after rmmod + * virtual resolutions + * kernel parameter 'video=hga:font:{fontname}' + * module parameter 'font={fontname}' + * module parameter 'nologo={0|1}' + * the most important: boot logo :) + * - Revision 0.1.0 (6 Dec 1999): faster scrolling and minor fixes + * - First release (25 Nov 1999) + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive + * for more details. + */ + +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/string.h> +#include <linux/mm.h> +#include <linux/tty.h> +#include <linux/malloc.h> +#include <linux/delay.h> +#include <linux/fb.h> +#include <linux/init.h> +#include <linux/ioport.h> +#include <asm/io.h> +#include <asm/vga.h> +#include <video/fbcon.h> +#include <video/fbcon-hga.h> + +#ifdef MODULE + +#define INCLUDE_LINUX_LOGOBW +#include <linux/linux_logo.h> + +#endif /* MODULE */ + +#if 0 +#define DPRINTK(args...) printk(KERN_DEBUG __FILE__": " ##args) +#else +#define DPRINTK(args...) +#endif + +#if 1 +#define CHKINFO(ret) if (info != &fb_info) { printk(KERN_DEBUG __FILE__": This should never happen, line:%d \n", __LINE__); return ret; } +#else +#define CHKINFO(ret) +#endif + +/* Description of the hardware layout */ + +static unsigned long hga_vram_base; /* Base of video memory */ +static unsigned long hga_vram_len; /* Size of video memory */ + +#define HGA_TXT 0 +#define HGA_GFX 1 + +static int hga_mode = -1; /* 0 = txt, 1 = gfx mode */ + +static enum { TYPE_HERC, TYPE_HERCPLUS, TYPE_HERCCOLOR } hga_type; +static char *hga_type_name; + +#define HGA_INDEX_PORT 0x3b4 /* Register select port */ +#define HGA_VALUE_PORT 0x3b5 /* Register value port */ +#define HGA_MODE_PORT 0x3b8 /* Mode control port */ +#define HGA_STATUS_PORT 0x3ba /* Status and Config port */ +#define HGA_GFX_PORT 0x3bf /* Graphics control port */ + +/* HGA register values */ + +#define HGA_CURSOR_BLINKING 0x00 +#define HGA_CURSOR_OFF 0x20 +#define HGA_CURSOR_SLOWBLINK 0x60 + +#define HGA_MODE_GRAPHICS 0x02 +#define HGA_MODE_VIDEO_EN 0x08 +#define HGA_MODE_BLINK_EN 0x20 +#define HGA_MODE_GFX_PAGE1 0x80 + +#define HGA_STATUS_HSYNC 0x01 +#define HGA_STATUS_VSYNC 0x80 +#define HGA_STATUS_VIDEO 0x08 + +#define HGA_CONFIG_COL132 0x08 +#define HGA_GFX_MODE_EN 0x01 +#define HGA_GFX_PAGE_EN 0x02 + +/* Framebuffer driver structures */ + +static struct fb_var_screeninfo hga_default_var = { + 720, 348, /* xres, yres */ + 720, 348, /* xres_virtual, yres_virtual */ + 0, 0, /* xoffset, yoffset */ + 1, /* bits_per_pixel */ + 0, /* grayscale */ + {0, 1, 0}, /* red */ + {0, 1, 0}, /* green */ + {0, 1, 0}, /* blue */ + {0, 0, 0}, /* transp */ + 0, /* nonstd (FB_NONSTD_HGA ?) */ + 0, /* activate */ + -1, -1, /* height, width */ + 0, /* accel_flags */ + /* pixclock */ + /* left_margin, right_margin */ + /* upper_margin, lower_margin */ + /* hsync_len, vsync_len */ + /* sync */ + /* vmode */ +}; + +static struct fb_fix_screeninfo hga_fix = { + "HGA", /* id */ + (unsigned long) NULL, /* smem_start */ + 0, /* smem_len */ + FB_TYPE_PACKED_PIXELS, /* type (not sure) */ + 0, /* type_aux (not sure) */ + FB_VISUAL_MONO10, /* visual */ + 8, /* xpanstep */ + 8, /* ypanstep */ + 0, /* ywrapstep */ + 90, /* line_length */ + 0, /* mmio_start */ + 0, /* mmio_len */ + FB_ACCEL_NONE /* accel */ +}; + +static struct fb_info fb_info; +static struct display disp; + +/* Don't assume that tty1 will be the initial current console. */ +static int currcon = -1; +static int release_io_port = 0; +static int release_io_ports = 0; + +#ifdef MODULE +static char *font = NULL; +static int nologo = 0; +#endif + +/* ------------------------------------------------------------------------- + * + * Low level hardware functions + * + * ------------------------------------------------------------------------- */ + +static void write_hga_b(unsigned int val, unsigned char reg) +{ + unsigned long flags; + + save_flags(flags); cli(); + + outb_p(reg, HGA_INDEX_PORT); + outb_p(val, HGA_VALUE_PORT); + + restore_flags(flags); +} + +static void write_hga_w(unsigned int val, unsigned char reg) +{ + unsigned long flags; + + save_flags(flags); cli(); + + outb_p(reg, HGA_INDEX_PORT); outb_p(val >> 8, HGA_VALUE_PORT); + outb_p(reg+1, HGA_INDEX_PORT); outb_p(val & 0xff, HGA_VALUE_PORT); + + restore_flags(flags); +} + +static int test_hga_b(unsigned char val, unsigned char reg) +{ + unsigned long flags; + + save_flags(flags); cli(); + + outb_p(reg, HGA_INDEX_PORT); + outb (val, HGA_VALUE_PORT); + + udelay(20); val = (inb_p(HGA_VALUE_PORT) == val); + + restore_flags(flags); + + return val; +} + +static void hga_clear_screen(void) +{ + if (hga_mode == HGA_TXT) + memset((char *)hga_vram_base, ' ', hga_vram_len); + else if (hga_mode == HGA_GFX) + memset((char *)hga_vram_base, 0, hga_vram_len); +} + + +static void hga_txt_mode(void) +{ + outb_p(HGA_MODE_VIDEO_EN | HGA_MODE_BLINK_EN, HGA_MODE_PORT); + outb_p(0x00, HGA_GFX_PORT); + outb_p(0x00, HGA_STATUS_PORT); + + write_hga_b(0x61, 0x00); /* horizontal total */ + write_hga_b(0x50, 0x01); /* horizontal displayed */ + write_hga_b(0x52, 0x02); /* horizontal sync pos */ + write_hga_b(0x0f, 0x03); /* horizontal sync width */ + + write_hga_b(0x19, 0x04); /* vertical total */ + write_hga_b(0x06, 0x05); /* vertical total adjust */ + write_hga_b(0x19, 0x06); /* vertical displayed */ + write_hga_b(0x19, 0x07); /* vertical sync pos */ + + write_hga_b(0x02, 0x08); /* interlace mode */ + write_hga_b(0x0d, 0x09); /* maximum scanline */ + write_hga_b(0x0c, 0x0a); /* cursor start */ + write_hga_b(0x0d, 0x0b); /* cursor end */ + + write_hga_w(0x0000, 0x0c); /* start address */ + write_hga_w(0x0000, 0x0e); /* cursor location */ + + hga_mode = HGA_TXT; +} + +static void hga_gfx_mode(void) +{ + outb_p(0x00, HGA_STATUS_PORT); + outb_p(HGA_GFX_MODE_EN, HGA_GFX_PORT); + outb_p(HGA_MODE_VIDEO_EN | HGA_MODE_GRAPHICS, HGA_MODE_PORT); + + write_hga_b(0x35, 0x00); /* horizontal total */ + write_hga_b(0x2d, 0x01); /* horizontal displayed */ + write_hga_b(0x2e, 0x02); /* horizontal sync pos */ + write_hga_b(0x07, 0x03); /* horizontal sync width */ + + write_hga_b(0x5b, 0x04); /* vertical total */ + write_hga_b(0x02, 0x05); /* vertical total adjust */ + write_hga_b(0x57, 0x06); /* vertical displayed */ + write_hga_b(0x57, 0x07); /* vertical sync pos */ + + write_hga_b(0x02, 0x08); /* interlace mode */ + write_hga_b(0x03, 0x09); /* maximum scanline */ + write_hga_b(0x00, 0x0a); /* cursor start */ + write_hga_b(0x00, 0x0b); /* cursor end */ + + write_hga_w(0x0000, 0x0c); /* start address */ + write_hga_w(0x0000, 0x0e); /* cursor location */ + + hga_mode = HGA_GFX; +} + +#ifdef MODULE +static void hga_show_logo(void) +{ + int x, y; + char *dest = (char *)hga_vram_base; + char *logo = linux_logo_bw; + for (y = 134; y < 134 + 80 ; y++) /* this needs some cleanup */ + for (x = 0; x < 10 ; x++) + *(dest + (y%4)*8192 + (y>>2)*90 + x + 40) = ~*(logo++); +} +#endif /* MODULE */ + +static void hga_pan(unsigned int xoffset, unsigned int yoffset) +{ + unsigned int base; + base = (yoffset / 8) * 90 + xoffset; + write_hga_w(base, 0x0c); /* start address */ + DPRINTK("hga_pan: base:%d\n", base); +} + +static int hga_card_detect(void) +{ + int count=0; + u16 *p, p_save; + u16 *q, q_save; + + hga_vram_base = VGA_MAP_MEM(0xb0000); + hga_vram_len = 0x08000; + + if (!request_mem_region(hga_vram_base, hga_vram_len, "hgafb")) { + printk(KERN_ERR "hgafb: cannot reserve video memory at 0x%lX\n", + hga_vram_base); + return 0; + } + if (request_region(0x3b0, 12, "hgafb")) + release_io_ports = 1; + if (request_region(0x3bf, 1, "hgafb")) + release_io_port = 1; + + /* do a memory check */ + + p = (u16 *) hga_vram_base; + q = (u16 *) (hga_vram_base + 0x01000); + + p_save = scr_readw(p); q_save = scr_readw(q); + + scr_writew(0xaa55, p); if (scr_readw(p) == 0xaa55) count++; + scr_writew(0x55aa, p); if (scr_readw(p) == 0x55aa) count++; + scr_writew(p_save, p); + + if (count != 2) { + return 0; + } + + /* Ok, there is definitely a card registering at the correct + * memory location, so now we do an I/O port test. + */ + + if (!test_hga_b(0x66, 0x0f)) { /* cursor low register */ + return 0; + } + if (!test_hga_b(0x99, 0x0f)) { /* cursor low register */ + return 0; + } + + /* See if the card is a Hercules, by checking whether the vsync + * bit of the status register is changing. This test lasts for + * approximately 1/10th of a second. + */ + + p_save = q_save = inb_p(HGA_STATUS_PORT) & HGA_STATUS_VSYNC; + + for (count=0; count < 50000 && p_save == q_save; count++) { + q_save = inb(HGA_STATUS_PORT) & HGA_STATUS_VSYNC; + udelay(2); + } + + if (p_save != q_save) { + switch (inb_p(HGA_STATUS_PORT) & 0x70) { + case 0x10: + hga_type = TYPE_HERCPLUS; + hga_type_name = "HerculesPlus"; + break; + case 0x50: + hga_type = TYPE_HERCCOLOR; + hga_type_name = "HerculesColor"; + break; + default: + hga_type = TYPE_HERC; + hga_type_name = "Hercules"; + break; + } + } + return 1; +} + +/* ------------------------------------------------------------------------- * + * + * dispsw functions + * + * ------------------------------------------------------------------------- */ + + + /* + * Open/Release the frame buffer device + */ + +static int hgafb_open(struct fb_info *info, int user) +{ + /* Nothing, only a usage count for the moment */ + MOD_INC_USE_COUNT; + return 0; +} + +static int hgafb_release(struct fb_info *info, int user) +{ + MOD_DEC_USE_COUNT; + return 0; +} + + + /* + * Get the Fixed Part of the Display + */ + +int hga_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info) +{ + CHKINFO(-EINVAL); + DPRINTK("hga_get_fix: con:%d, info:%x, fb_info:%x\n", con, (unsigned)info, (unsigned)&fb_info); + + *fix = info->fix; + return 0; +} + + + /* + * Get the User Defined Part of the Display + */ + +int hga_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info) +{ + CHKINFO(-EINVAL); + DPRINTK("hga_get_var: con:%d, info:%x, fb_info:%x\n", con, (unsigned)info, (unsigned)&fb_info); + + *var = info->var; + return 0; +} + + /* + * Set the User Defined Part of the Display + * This is the most mystical function (at least for me). + * What is the exact specification of xxx_set_var? + * Should it handle xoffset, yoffset? Should it do pannig? + * What does vmode mean? + */ + +int hga_set_var(struct fb_var_screeninfo *var, int con, struct fb_info *info) +{ + CHKINFO(-EINVAL); + DPRINTK("hga_set_var: con:%d, activate:%x, info:0x%x, fb_info:%x\n", con, var->activate, (unsigned)info, (unsigned)&fb_info); + + if (var->xres != 720 || var->yres != 348 || + var->xres_virtual != 720 || + var->yres_virtual < 348 || var->yres_virtual > 348 + 16 || + var->bits_per_pixel != 1 || var->grayscale != 0) { + return -EINVAL; + } + if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) { + info->var = *var; + if (info->changevar) + (*info->changevar)(con); + } + return 0; +} + + + /* + * Get the Colormap + */ + +static int hga_getcolreg(u_int regno, u_int *red, u_int *green, u_int *blue, + u_int *transp, struct fb_info *info) +{ + if (regno == 0) { + *red = *green = *blue = 0x0000; + *transp = 0; + } else if (regno == 1) { + *red = *green = *blue = 0xaaaa; + *transp = 0; + } else + return 1; + return 0; +} + +int hga_get_cmap(struct fb_cmap *cmap, int kspc, int con, + struct fb_info *info) +{ + CHKINFO(-EINVAL); + DPRINTK("hga_get_cmap: con:%d\n", con); + return fb_get_cmap(cmap, kspc, hga_getcolreg, info); +} + + /* + * Set the Colormap + */ + +static int hga_setcolreg(u_int regno, u_int red, u_int green, u_int blue, + u_int transp, struct fb_info *info) +{ + if (regno > 1) + return 1; + return 0; +} + +int hga_set_cmap(struct fb_cmap *cmap, int kspc, int con, + struct fb_info *info) +{ + CHKINFO(-EINVAL); + DPRINTK("hga_set_cmap: con:%d\n", con); + return fb_set_cmap(cmap, kspc, hga_setcolreg, info); +} + + /* + * Pan or Wrap the Display + * + * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag + */ + +int hga_pan_display(struct fb_var_screeninfo *var, int con, + struct fb_info *info) +{ + CHKINFO(-EINVAL); + DPRINTK("pan_disp: con:%d, wrap:%d, xoff:%d, yoff:%d\n", con, var->vmode & FB_VMODE_YWRAP, var->xoffset, var->yoffset); + + if (var->vmode & FB_VMODE_YWRAP) { + if (var->yoffset < 0 || + var->yoffset >= info->var.yres_virtual || + var->xoffset) + return -EINVAL; + } else { + if (var->xoffset + var->xres > info->var.xres_virtual + || var->yoffset + var->yres > info->var.yres_virtual + || var->yoffset % 8) + return -EINVAL; + } + + hga_pan(var->xoffset, var->yoffset); + + info->var.xoffset = var->xoffset; + info->var.yoffset = var->yoffset; + if (var->vmode & FB_VMODE_YWRAP) + info->var.vmode |= FB_VMODE_YWRAP; + else + info->var.vmode &= ~FB_VMODE_YWRAP; + return 0; +} + + + /* + * Frame Buffer Specific ioctls + */ + +int hga_ioctl(struct inode *inode, struct file *file, unsigned int cmd, + unsigned long arg, int con, struct fb_info *info) +{ + CHKINFO(-EINVAL); + DPRINTK("hga_ioctl: con:%d\n", con); + return -EINVAL; +} + + + + +static struct fb_ops hgafb_ops = { + hgafb_open, hgafb_release, hga_get_fix, hga_get_var, hga_set_var, + hga_get_cmap, hga_set_cmap, hga_pan_display, hga_ioctl +}; + + +/* ------------------------------------------------------------------------- * + * + * Functions in fb_info + * + * ------------------------------------------------------------------------- */ + +static int hgafbcon_switch(int con, struct fb_info *info) +{ + CHKINFO(-EINVAL); + DPRINTK("hgafbcon_switch: currcon:%d, con:%d, info:%x, fb_info:%x\n", currcon, con, (unsigned)info, (unsigned)&fb_info); + + /* Save the colormap and video mode */ +#if 0 /* Not necessary in hgafb, we use fixed colormap */ + fb_copy_cmap(&info->cmap, &fb_display[currcon].cmap, 0); +#endif + + if (currcon != -1) /* this check is absolute necessary! */ + memcpy(&fb_display[currcon].var, &info->var, + sizeof(struct fb_var_screeninfo)); + + /* Install a new colormap and change the video mode. By default fbcon + * sets all the colormaps and video modes to the default values at + * bootup. + */ +#if 0 + fb_copy_cmap(&fb_display[con].cmap, &info->cmap, 0); + fb_set_cmap(&info->cmap, 1, hga_setcolreg, info); +#endif + + memcpy(&info->var, &fb_display[con].var, + sizeof(struct fb_var_screeninfo)); + /* hga_set_var(&info->var, con, &fb_info); is it necessary? */ + currcon = con; + + /* Hack to work correctly with XF86_Mono */ + hga_gfx_mode(); + return 0; +} + +static int hgafbcon_updatevar(int con, struct fb_info *info) +{ + CHKINFO(-EINVAL); + DPRINTK("hga_update_var: con:%d, info:%x, fb_info:%x\n", con, (unsigned)info, (unsigned)&fb_info); + return (con < 0) ? -EINVAL : hga_pan_display(&fb_display[con].var, con, info); +} + +static void hgafbcon_blank(int blank_mode, struct fb_info *info) +{ + /* + * Blank the screen if blank_mode != 0, else unblank. + * Implements VESA suspend and powerdown modes on hardware + * that supports disabling hsync/vsync: + * blank_mode == 2: suspend vsync + * blank_mode == 3: suspend hsync + * blank_mode == 4: powerdown + */ + + CHKINFO( ); + DPRINTK("hga_blank: blank_mode:%d, info:%x, fb_info:%x\n", blank_mode, (unsigned)info, (unsigned)&fb_info); + + if (blank_mode) { + outb_p(0x00, HGA_MODE_PORT); /* disable video */ + } else { + outb_p(HGA_MODE_VIDEO_EN | HGA_MODE_GRAPHICS, HGA_MODE_PORT); + } +} + + +/* ------------------------------------------------------------------------- */ + + /* + * Initialization + */ + +int __init hgafb_init(void) +{ + if (! hga_card_detect()) { + printk(KERN_ERR "hgafb: HGA card not detected.\n"); + return -EINVAL; + } + + printk(KERN_INFO "hgafb: %s with %ldK of memory detected.\n", + hga_type_name, hga_vram_len/1024); + + hga_gfx_mode(); + hga_clear_screen(); +#ifdef MODULE + if (!nologo) hga_show_logo(); +#endif /* MODULE */ + + hga_fix.smem_start = hga_vram_base; + hga_fix.smem_len = hga_vram_len; + + disp.var = hga_default_var; +/* disp.cmap = ???; */ + disp.screen_base = (char*)hga_fix.smem_start; + disp.visual = hga_fix.visual; + disp.type = hga_fix.type; + disp.type_aux = hga_fix.type_aux; + disp.ypanstep = hga_fix.ypanstep; + disp.ywrapstep = hga_fix.ywrapstep; + disp.line_length = hga_fix.line_length; + disp.can_soft_blank = 1; + disp.inverse = 0; + disp.dispsw = &fbcon_hga; + disp.dispsw_data = NULL; + + disp.scrollmode = SCROLL_YREDRAW; + + strcpy (fb_info.modename, hga_fix.id); + fb_info.node = -1; + fb_info.flags = FBINFO_FLAG_DEFAULT; +/* fb_info.open = ??? */ + fb_info.var = hga_default_var; + fb_info.fix = hga_fix; + fb_info.monspecs.hfmin = 0; + fb_info.monspecs.hfmax = 0; + fb_info.monspecs.vfmin = 10000; + fb_info.monspecs.vfmax = 10000; + fb_info.monspecs.dpms = 0; + fb_info.fbops = &hgafb_ops; + fb_info.screen_base = (char *)hga_fix.smem_start; + fb_info.disp = &disp; +/* fb_info.display_fg = ??? */ +/* fb_info.fontname initialized later */ + fb_info.changevar = NULL; + fb_info.switch_con = hgafbcon_switch; + fb_info.updatevar = hgafbcon_updatevar; + fb_info.blank = hgafbcon_blank; + fb_info.pseudo_palette = NULL; /* ??? */ + fb_info.par = NULL; + + if (register_framebuffer(&fb_info) < 0) + return -EINVAL; + + printk(KERN_INFO "fb%d: %s frame buffer device\n", + GET_FB_IDX(fb_info.node), fb_info.modename); + + return 0; +} + + /* + * Setup + */ + +#ifndef MODULE +int __init hgafb_setup(char *options) +{ + /* + * Parse user speficied options + * `video=hga:font:VGA8x16' or + * `video=hga:font:SUN8x16' recommended + * Other supported fonts: VGA8x8, Acorn8x8, PEARL8x8 + * More different fonts can be used with the `setfont' utility. + */ + + char *this_opt; + + fb_info.fontname[0] = '\0'; + + if (!options || !*options) + return 0; + + for (this_opt = strtok(options, ","); this_opt; + this_opt = strtok(NULL, ",")) { + if (!strncmp(this_opt, "font:", 5)) + strcpy(fb_info.fontname, this_opt+5); + } + return 0; +} +#endif /* !MODULE */ + + + /* + * Cleanup + */ + +#ifdef MODULE +static void hgafb_cleanup(struct fb_info *info) +{ + hga_txt_mode(); + hga_clear_screen(); + unregister_framebuffer(info); + if (release_io_ports) release_region(0x3b0, 12); + if (release_io_port) release_region(0x3bf, 1); + release_mem_region(hga_vram_base, hga_vram_len); +} +#endif /* MODULE */ + + + +/* ------------------------------------------------------------------------- + * + * Modularization + * + * ------------------------------------------------------------------------- */ + +#ifdef MODULE +int init_module(void) +{ + if (font) + strncpy(fb_info.fontname, font, sizeof(fb_info.fontname)-1); + else + fb_info.fontname[0] = '\0'; + + return hgafb_init(); +} + +void cleanup_module(void) +{ + hgafb_cleanup(&fb_info); +} + +MODULE_AUTHOR("Ferenc Bakonyi (fero@drama.obuda.kando.hu)"); +MODULE_DESCRIPTION("FBDev driver for Hercules Graphics Adaptor"); + +MODULE_PARM(font, "s"); +MODULE_PARM_DESC(font, "Specifies one of the compiled-in fonts (VGA8x8, VGA8x16, SUN8x16, Acorn8x8, PEARL8x8) (default=none)"); +MODULE_PARM(nologo, "i"); +MODULE_PARM_DESC(nologo, "Disables startup logo if != 0 (default=0)"); + +#endif /* MODULE */ diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 4e8c4e9d4..82c916d8a 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c @@ -517,8 +517,8 @@ static int __devinit rivafb_init_one (struct pci_dev *pd, rinfo->riva.Architecture = rci->arch_rev; rinfo->pd = pd; - rinfo->base0_region_size = pci_resource_start (pd, 0); - rinfo->base1_region_size = pci_resource_start (pd, 1); + rinfo->base0_region_size = pci_resource_len (pd, 0); + rinfo->base1_region_size = pci_resource_len (pd, 1); assert (rinfo->base0_region_size >= 0x00800000); /* from GGI */ assert (rinfo->base0_region_size >= 0x01000000); /* from GGI */ diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index 1a346c5aa..bdd8bda70 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c @@ -648,8 +648,12 @@ int __init vesafb_init(void) * region already (FIXME) */ request_region(0x3c0, 32, "vesafb"); - if (mtrr) - mtrr_add(video_base, video_size, MTRR_TYPE_WRCOMB, 1); + if (mtrr) { + int temp_size = video_size; + while (mtrr_add(video_base, temp_size, MTRR_TYPE_WRCOMB, 1)==-EINVAL) { + temp_size >>= 1; + } + } strcpy(fb_info.modename, "VESA VGA"); fb_info.changevar = NULL; diff --git a/drivers/video/vgacon.c b/drivers/video/vgacon.c index 1180d3ee0..56a052647 100644 --- a/drivers/video/vgacon.c +++ b/drivers/video/vgacon.c @@ -94,6 +94,8 @@ static u8 vgacon_build_attr(struct vc_data *c, u8 color, u8 intensity, u8 blink, static void vgacon_invert_region(struct vc_data *c, u16 *p, int count); static unsigned long vgacon_uni_pagedir[2]; +void clear_status_line( void ); + /* Description of the hardware situation */ static unsigned long vga_vram_base; /* Base of video memory */ @@ -349,6 +351,7 @@ static void vgacon_init(struct vc_data *c, int init) static inline void vga_set_mem_top(struct vc_data *c) { write_vga(12, (c->vc_visible_origin-vga_vram_base)/2); + clear_status_line(); } static void vgacon_deinit(struct vc_data *c) @@ -1057,3 +1060,80 @@ struct consw vga_con = { vgacon_build_attr, vgacon_invert_region }; + + +int inited = 0; + +void +clear_status_line( void ) +{ +#if CONFIG_COMMENT_INT==3 + u16 *org; + int i; + int currcons = fg_console; + struct vc_data *c = vc_cons[fg_console].d; + if (!inited) return; + if (vga_is_gfx) return; + if (c->vc_origin != c->vc_visible_origin) return; + org = screen_pos( fg_console, video_num_lines*video_num_columns, 1 ); + for (i=0; i<video_num_columns; i++) + scr_writew( (0x0f << 8) + ' ', org++ ); +#endif +} + +#if CONFIG_COMMENT_INT==3 +void +paint_status_line( int timer ) +{ + u16 *org; + int i,j; + int currcons = fg_console; + struct vc_data *c = vc_cons[fg_console].d; + + if (!inited) return; + if (vga_is_gfx) /* We don't play origin tricks in graphic modes */ + return; + if (c->vc_origin != c->vc_visible_origin) return; + + org = screen_pos( fg_console, video_num_lines*video_num_columns, 1 ); + + /* Are we busy? */ + { + i = current->pid; + j = 0; + if (i) + j = (i>16) ? ((current->priority < DEF_PRIORITY) ? 0xA0:0xE0) : 0xC0; + scr_writew( (j<<8) + ' ', org++ ); + +#if 0 + org++; + +#define DISP( x ) scr_writew( (((i&x) ? 0x90:0) << 8) + ' ', org++ ); + DISP( 0x80 ); + DISP( 0x40 ); + DISP( 0x20 ); + DISP( 0x10 ); + DISP( 0x08 ); + DISP( 0x04 ); + DISP( 0x02 ); + DISP( 0x01 ); +#endif + } + + if (!timer) return; + + org++; + /* Serial? */ + { + j = (ledflags & 0x10) ? 0x90 : 0x00; + scr_writew( (j<<8) + 'S', org++ ); + } + + org++; + /* NE2000? */ + { + j = (ledflags & 0x20) ? 0x90 : 0x00; + scr_writew( (j<<8) + 'N', org++ ); + } +} +#endif |