Date: Mon, 31 Aug 1998 23:54:49 +0200 (CEST) From: Geert Uytterhoeven To: Jes Sorensen cc: linux-m68k@lists.linux-m68k.org Subject: Re: L68K: 2.1.119 is out In-Reply-To: Sender: owner-linux-m68k@phil.uni-sb.de On Mon, 31 Aug 1998, Geert Uytterhoeven wrote: > Video patches (upgrade to vger) will follow soon. Here they are. Notes: - Update console/video subsystem to vger-current - Move fbmem.c from drivers/char to drivers/video - Move many includes from drivers/video to include/video - Remove everything that smells like gspcon, vgafb or mdafb - The 16 color Penguin works again! - The palette code for Atari is still broken for everything but TT. Who's willing to fix it? (special thanks to Andreas for the fixes for TT) - Franky: no, g364fb is not the Rainbow III driver :-) I'm waiting for the results of my betatester so I can merge both... diff -u --recursive --exclude-from=/home/geert/diff-excludes-linux --new-file jes-2.1.119/drivers/char/Makefile m68k/drivers/char/Makefile --- jes-2.1.119/drivers/char/Makefile Sun Aug 30 20:40:39 1998 +++ m68k/drivers/char/Makefile Mon Aug 31 00:44:17 1998 @@ -27,9 +27,6 @@ L_OBJS += vt.o vc_screen.o consolemap.o consolemap_deftbl.o LX_OBJS += console.o selection.o endif -ifdef CONFIG_FB - LX_OBJS += fbmem.o -endif ifeq ($(CONFIG_ATARI_MFPSER),y) L_OBJS += atari_MFPser.o diff -u --recursive --exclude-from=/home/geert/diff-excludes-linux --new-file jes-2.1.119/drivers/char/console.c m68k/drivers/char/console.c --- jes-2.1.119/drivers/char/console.c Sun Aug 30 20:40:40 1998 +++ m68k/drivers/char/console.c Mon Aug 31 20:30:56 1998 @@ -47,7 +47,6 @@ * - video_num_columns * - video_num_lines * - video_size_row - * - video_screen_size * - can_do_color * * The abstract console driver provides a generic interface for a text @@ -108,8 +107,6 @@ struct consw *conswitchp = NULL; -static int vesa_blank_mode = 0; /* 0:none 1:suspendV 2:suspendH 3:powerdown */ - /* A bitmap for codes <32. A bit of 1 indicates that the code * corresponding to that bit number invokes some special action * (such as cursor movement) and should not be displayed as a @@ -137,17 +134,18 @@ static void vc_init(unsigned int console, unsigned int rows, unsigned int cols, int do_clear); static void blank_screen(void); -static void unblank_screen(void); static void gotoxy(int currcons, int new_x, int new_y); static void save_cur(int currcons); static void reset_terminal(int currcons, int do_clear); static void con_flush_chars(struct tty_struct *tty); +static void set_vesa_blanking(unsigned long arg); static int printable = 0; /* Is console ready for printing? */ int do_poke_blanked_console = 0; int console_blanked = 0; +static int vesa_blank_mode = 0; /* 0:none 1:suspendV 2:suspendH 3:powerdown */ static int blankinterval = 10*60*HZ; static int vesa_off_interval = 0; @@ -183,7 +181,7 @@ */ #define IS_FG (currcons == fg_console) -#define IS_VISIBLE (*display_fg == vc_cons[currcons].d) +#define IS_VISIBLE CON_IS_VISIBLE(vc_cons[currcons].d) #ifdef VT_BUF_VRAM_ONLY #define DO_UPDATE 0 @@ -503,9 +501,8 @@ pos = origin + video_size_row*y + 2*x; } -static inline void save_screen(void) +static inline void save_screen(int currcons) { - int currcons = fg_console; if (sw->con_save_screen) sw->con_save_screen(vc_cons[currcons].d); } @@ -514,13 +511,11 @@ * Redrawing of screen */ -void update_screen(int new_console) +void redraw_screen(int new_console, int is_switch) { - int currcons = fg_console; int redraw = 1; - int old_console; + int currcons, old_console; static int lock = 0; - struct vc_data **display; if (lock) return; @@ -531,28 +526,40 @@ } lock = 1; - hide_cursor(currcons); - if (fg_console != new_console) { - display = vc_cons[new_console].d->vc_display_fg; - old_console = (*display) ? (*display)->vc_num : fg_console; - *display = vc_cons[new_console].d; - fg_console = new_console; - currcons = old_console; - if (!IS_VISIBLE) - set_origin(currcons); + if (is_switch) { + currcons = fg_console; + hide_cursor(currcons); + if (fg_console != new_console) { + struct vc_data **display = vc_cons[new_console].d->vc_display_fg; + old_console = (*display) ? (*display)->vc_num : fg_console; + *display = vc_cons[new_console].d; + fg_console = new_console; + currcons = old_console; + if (!IS_VISIBLE) { + save_screen(currcons); + set_origin(currcons); + } + currcons = new_console; + if (old_console == new_console) + redraw = 0; + } + } else { currcons = new_console; - if (old_console == new_console) - redraw = 0; + hide_cursor(currcons); } + if (redraw) { set_origin(currcons); - if (sw->con_switch(vc_cons[currcons].d)) + set_palette(currcons); + if (sw->con_switch(vc_cons[currcons].d) && vcmode != KD_GRAPHICS) /* Update the screen contents */ do_update_region(currcons, origin, screenbuf_size/2); } set_cursor(currcons); - set_leds(); - compute_shiftstate(); + if (is_switch) { + set_leds(); + compute_shiftstate(); + } lock = 0; } @@ -579,7 +586,7 @@ if (!complement_mask) complement_mask = can_do_color ? 0x7700 : 0x0800; video_size_row = video_num_columns<<1; - video_screen_size = video_num_lines*video_size_row; + screenbuf_size = video_num_lines*video_size_row; } int vc_allocate(unsigned int currcons, int init) /* return 0 on success */ @@ -595,7 +602,7 @@ /* due to the granularity of kmalloc, we waste some memory here */ /* the alloc is done in two steps, to optimize the common situation - of a 25x80 console (structsize=216, video_screen_size=4000) */ + of a 25x80 console (structsize=216, screenbuf_size=4000) */ /* although the numbers above are not valid since long ago, the point is still up-to-date and the comment still has its value even if only as a historical artifact. --mj, July 1998 */ @@ -605,7 +612,7 @@ vc_cons[currcons].d = (struct vc_data *)p; vt_cons[currcons] = (struct vt_struct *)(p+sizeof(struct vc_data)); visual_init(currcons); - q = (long)kmalloc(video_screen_size, GFP_KERNEL); + q = (long)kmalloc(screenbuf_size, GFP_KERNEL); if (!q) { kfree_s((char *) p, structsize); vc_cons[currcons].d = NULL; @@ -616,7 +623,6 @@ con_set_default_unimap(currcons); screenbuf = (unsigned short *) q; kmalloced = 1; - screenbuf_size = video_screen_size; if (!sw->con_save_screen) init = 0; /* If console does not have save_screen routine, we should clear the screen */ @@ -670,12 +676,12 @@ oll = video_num_lines; occ = video_num_columns; osr = video_size_row; - oss = video_screen_size; + oss = screenbuf_size; video_num_lines = ll; video_num_columns = cc; video_size_row = sr; - video_screen_size = ss; + screenbuf_size = ss; rlth = MIN(osr, sr); rrem = sr - rlth; @@ -720,11 +726,10 @@ *cws = ws; } - if (IS_FG && vt_cons[fg_console]->vc_mode == KD_TEXT) + if (IS_VISIBLE) update_screen(fg_console); } - set_cursor(fg_console); return 0; } @@ -1139,7 +1144,7 @@ case 5: /* Inverted screen on/off */ if (decscnm != on_off) { decscnm = on_off; - invert_screen(currcons, 0, video_screen_size, 0); + invert_screen(currcons, 0, screenbuf_size, 0); update_attr(currcons); } break; @@ -1488,7 +1493,7 @@ vc_state = ESpalette; return; } else if (c=='R') { /* reset palette */ - reset_palette (currcons); + reset_palette(currcons); vc_state = ESnormal; } else vc_state = ESnormal; @@ -1504,7 +1509,7 @@ palette[i++] += par[j++]; palette[i] = 16*par[j++]; palette[i] += par[j]; - set_palette() ; + set_palette(currcons); vc_state = ESnormal; } } else @@ -1902,7 +1907,6 @@ if (want_console >= 0) { if (want_console != fg_console && vc_cons_allocated(want_console)) { hide_cursor(fg_console); - save_screen(); change_console(want_console); /* we only changed when the console had already been allocated - a new console is not created @@ -2016,7 +2020,7 @@ NULL, vt_console_device, keyboard_wait_for_keypress, - do_unblank_screen, + unblank_screen, NULL, CON_PRINTBUFFER, -1, @@ -2046,7 +2050,7 @@ case 3: return paste_selection(tty); case 4: - do_unblank_screen(); + unblank_screen(); return 0; case 5: return sel_loadlut(arg); @@ -2195,7 +2199,7 @@ video_num_columns = cols; video_num_lines = rows; video_size_row = cols<<1; - video_screen_size = video_num_lines * video_size_row; + screenbuf_size = video_num_lines * video_size_row; set_origin(currcons); pos = origin; @@ -2282,9 +2286,8 @@ kmem_start += sizeof(struct vt_struct); visual_init(currcons); screenbuf = (unsigned short *) kmem_start; - kmem_start += video_screen_size; + kmem_start += screenbuf_size; kmalloced = 0; - screenbuf_size = video_screen_size; vc_init(currcons, video_num_lines, video_num_columns, currcons || !sw->con_save_screen); for (j=k=0; j<16; j++) { @@ -2293,15 +2296,13 @@ vc_cons[currcons].d->vc_palette[k++] = default_blu[j] ; } } - currcons = fg_console = 0; master_display_fg = vc_cons[currcons].d; set_origin(currcons); - save_screen(); + save_screen(currcons); gotoxy(currcons,x,y); csi_J(currcons, 0); update_screen(fg_console); - set_cursor(currcons); printk("Console: %s %s %dx%d", can_do_color ? "colour" : "mono", display_desc, video_num_columns, video_num_lines); @@ -2327,28 +2328,31 @@ void take_over_console(struct consw *csw, int first, int last, int deflt) { - int i; + int i, j = -1; const char *desc; - if (deflt) - conswitchp = csw; desc = csw->con_startup(); if (!desc) return; + if (deflt) + conswitchp = csw; for (i = first; i <= last; i++) { + int currcons = i; if (!vc_cons[i].d || !vc_cons[i].d->vc_sw) continue; - if (i == fg_console && - vc_cons[i].d->vc_sw->con_save_screen) - vc_cons[i].d->vc_sw->con_save_screen(vc_cons[i].d); + j = i; + if (IS_VISIBLE) + save_screen(i); vc_cons[i].d->vc_sw->con_deinit(vc_cons[i].d); vc_cons[i].d->vc_sw = csw; vc_cons[i].d->vc_sw->con_init(vc_cons[i].d, 0); - } - printk("Console: switching to %s %s %dx%d\n", - vc_cons[fg_console].d->vc_can_do_color ? "colour" : "mono", - desc, vc_cons[fg_console].d->vc_cols, vc_cons[fg_console].d->vc_rows); - set_palette(); + if (IS_VISIBLE) + update_screen(i); + } + if (j >= 0) + printk("Console: switching to %s %s %dx%d\n", + vc_cons[j].d->vc_can_do_color ? "colour" : "mono", + desc, vc_cons[j].d->vc_cols, vc_cons[j].d->vc_rows); } #endif @@ -2357,7 +2361,7 @@ * Screen blanking */ -void set_vesa_blanking(unsigned long arg) +static void set_vesa_blanking(unsigned long arg) { char *argp = (char *)arg + 1; unsigned int mode; @@ -2365,13 +2369,7 @@ vesa_blank_mode = (mode < 4) ? mode : 0; } -void vesa_blank(void) -{ - struct vc_data *c = vc_cons[fg_console].d; - c->vc_sw->con_blank(c, vesa_blank_mode + 1); -} - -void vesa_powerdown(void) +static void vesa_powerdown(void) { struct vc_data *c = vc_cons[fg_console].d; /* @@ -2391,7 +2389,7 @@ } } -void vesa_powerdown_screen(void) +static void vesa_powerdown_screen(void) { timer_active &= ~(1<con_blank(vc_cons[currcons].d, -1); console_blanked = fg_console + 1; set_origin(currcons); @@ -2418,13 +2416,13 @@ } /* don't blank graphics */ - if (vt_cons[fg_console]->vc_mode != KD_TEXT) { + if (vcmode != KD_TEXT) { console_blanked = fg_console + 1; return; } - hide_cursor(fg_console); - if(vesa_off_interval && !nopowersave) { + hide_cursor(currcons); + if (vesa_off_interval) { timer_table[BLANK_TIMER].fn = vesa_powerdown_screen; timer_table[BLANK_TIMER].expires = jiffies + vesa_off_interval; timer_active |= (1<con_blank(vc_cons[currcons].d, 1); console_blanked = fg_console + 1; if (i) set_origin(currcons); - if(!nopowersave) - { #ifdef CONFIG_APM - if (apm_display_blank()) - return; + if (apm_display_blank()) + return; #endif - vesa_blank(); - } + if (vesa_blank_mode) + sw->con_blank(vc_cons[currcons].d, vesa_blank_mode + 1); } -void do_unblank_screen(void) +void unblank_screen(void) { int currcons; + if (!console_blanked) return; if (!vc_cons_allocated(fg_console)) { @@ -2482,11 +2479,6 @@ do_blank_screen(0); } -static void unblank_screen(void) -{ - do_unblank_screen(); -} - void poke_blanked_console(void) { timer_active &= ~(1<vc_mode != KD_GRAPHICS) - vc_cons[fg_console].d->vc_sw->con_set_palette(vc_cons[fg_console].d, color_table); + if (vcmode != KD_GRAPHICS) + sw->con_set_palette(vc_cons[currcons].d, color_table); } -int set_get_cmap(unsigned char *arg, int set) +static int set_get_cmap(unsigned char *arg, int set) { int i, j, k; @@ -2528,13 +2520,14 @@ } if (set) { for (i = 0; i < MAX_NR_CONSOLES; i++) - if (vc_cons_allocated(i)) + if (vc_cons_allocated(i)) { for (j = k = 0; j < 16; j++) { vc_cons[i].d->vc_palette[k++] = default_red[j]; vc_cons[i].d->vc_palette[k++] = default_grn[j]; vc_cons[i].d->vc_palette[k++] = default_blu[j]; } - set_palette(); + set_palette(i); + } } return 0; } @@ -2544,25 +2537,25 @@ * map, 3 bytes per colour, 16 colours, range from 0 to 255. */ -int con_set_cmap (unsigned char *arg) +int con_set_cmap(unsigned char *arg) { return set_get_cmap (arg,1); } -int con_get_cmap (unsigned char *arg) +int con_get_cmap(unsigned char *arg) { return set_get_cmap (arg,0); } -void reset_palette (int currcons) +void reset_palette(int currcons) { - int j, k ; + int j, k; for (j=k=0; j<16; j++) { palette[k++] = default_red[j]; palette[k++] = default_grn[j]; palette[k++] = default_blu[j]; } - set_palette() ; + set_palette(currcons); } /* diff -u --recursive --exclude-from=/home/geert/diff-excludes-linux --new-file jes-2.1.119/drivers/char/fbmem.c m68k/drivers/char/fbmem.c --- jes-2.1.119/drivers/char/fbmem.c Sun Aug 30 20:40:40 1998 +++ m68k/drivers/char/fbmem.c Thu Jan 1 01:00:00 1970 @@ -1,666 +0,0 @@ -/* - * linux/drivers/char/fbmem.c - * - * Copyright (C) 1994 Martin Schaller - * - * 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 -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef CONFIG_PROC_FS -#include -#endif -#ifdef CONFIG_KMOD -#include -#endif - -#ifdef __mc68000__ -#include -#endif -#ifdef __powerpc__ -#include -#endif -#include -#include -#include - -#include - - - /* - * Frame buffer device initialization and setup routines - */ - -extern unsigned long acornfb_init(void); -extern void acornfb_setup(char *options, int *ints); -extern void amifb_init(void); -extern void amifb_setup(char *options, int *ints); -extern void atafb_init(void); -extern void atafb_setup(char *options, int *ints); -extern void macfb_init(void); -extern void macfb_setup(char *options, int *ints); -extern void cyberfb_init(void); -extern void cyberfb_setup(char *options, int *ints); -extern void retz3fb_init(void); -extern void retz3fb_setup(char *options, int *ints); -extern void clgenfb_init(void); -extern void clgenfb_setup(char *options, int *ints); -extern void vfb_init(void); -extern void vfb_setup(char *options, int *ints); -extern void offb_init(void); -extern void offb_setup(char *options, int *ints); -extern void atyfb_init(void); -extern void atyfb_setup(char *options, int *ints); -extern void dnfb_init(void); -extern void tgafb_init(void); -extern void virgefb_init(void); -extern void virgefb_setup(char *options, int *ints); -extern void resolver_video_setup(char *options, int *ints); -extern void s3triofb_init(void); -extern void s3triofb_setup(char *options, int *ints); -extern void vgafb_init(void); -extern void vgafb_setup(char *options, int *ints); -extern void vesafb_init(void); -extern void vesafb_setup(char *options, int *ints); -extern void mdafb_init(void); -extern void mdafb_setup(char *options, int *ints); -extern void hpfb_init(void); -extern void hpfb_setup(char *options, int *ints); -extern void sbusfb_init(void); -extern void sbusfb_setup(char *options, int *ints); - -static struct { - const char *name; - void (*init)(void); - void (*setup)(char *options, int *ints); -} fb_drivers[] __initdata = { -#ifdef CONFIG_FB_RETINAZ3 - { "retz3", retz3fb_init, retz3fb_setup }, -#endif -#ifdef CONFIG_FB_ACORN - { "acorn", acornfb_init, acornfb_setup }, -#endif -#ifdef CONFIG_FB_AMIGA - { "amifb", amifb_init, amifb_setup }, -#endif -#ifdef CONFIG_FB_ATARI - { "atafb", atafb_init, atafb_setup }, -#endif -#ifdef CONFIG_FB_MAC - { "macfb", macfb_init, macfb_setup }, -#endif -#ifdef CONFIG_FB_CYBER - { "cyber", cyberfb_init, cyberfb_setup }, -#endif -#ifdef CONFIG_FB_CLGEN - { "clgen", clgenfb_init, clgenfb_setup }, -#endif -#ifdef CONFIG_FB_OF - { "offb", offb_init, offb_setup }, -#endif -#ifdef CONFIG_FB_ATY - { "atyfb", atyfb_init, atyfb_setup }, -#endif -#ifdef CONFIG_APOLLO - { "apollo", dnfb_init, NULL }, -#endif -#ifdef CONFIG_FB_S3TRIO - { "s3trio", s3triofb_init, s3triofb_setup }, -#endif -#ifdef CONFIG_FB_TGA - { "tga", tgafb_init, NULL }, -#endif -#ifdef CONFIG_FB_VIRGE - { "virge", virgefb_init, virgefb_setup }, -#endif -#ifdef CONFIG_FB_VGA - { "vga", vgafb_init, vgafb_setup }, -#endif -#ifdef CONFIG_FB_VESA - { "vesa", vesafb_init, vesafb_setup }, -#endif -#ifdef CONFIG_FB_MDA - { "mda", mdafb_init, mdafb_setup }, -#endif -#ifdef CONFIG_FB_HP300 - { "hpfb", hpfb_init, hpfb_setup }, -#endif -#ifdef CONFIG_FB_SBUS - { "sbus", sbusfb_init, sbusfb_setup }, -#endif -#ifdef CONFIG_GSP_RESOLVER - /* Not a real frame buffer device... */ - { "resolver", NULL, resolver_video_setup }, -#endif -#ifdef CONFIG_FB_VIRTUAL - /* Must be last to avoid that vfb becomes your primary display */ - { "vfb", vfb_init, vfb_setup }, -#endif -}; - -#define NUM_FB_DRIVERS (sizeof(fb_drivers)/sizeof(*fb_drivers)) - -static void (*pref_init_funcs[FB_MAX])(void); -static int num_pref_init_funcs __initdata = 0; - - -struct fb_info *registered_fb[FB_MAX]; -int num_registered_fb = 0; - -char con2fb_map[MAX_NR_CONSOLES]; - -static inline int PROC_CONSOLE(void) -{ - if (!current->tty) - return fg_console; - - if (current->tty->driver.type != TTY_DRIVER_TYPE_CONSOLE) - /* XXX Should report error here? */ - return fg_console; - - if (MINOR(current->tty->device) < 1) - return fg_console; - - return MINOR(current->tty->device) - 1; -} - -#ifdef CONFIG_PROC_FS -static int fbmem_read_proc(char *buf, char **start, off_t offset, - int len, int *eof, void *private) -{ - struct fb_info **fi; - - len = 0; - for (fi = registered_fb; fi < ®istered_fb[FB_MAX] && len < 4000; fi++) - if (*fi) - len += sprintf(buf + len, "%d %s\n", - (*fi)->node, - (*fi)->modename); - *start = buf + offset; - return len > offset ? len - offset : 0; -} -#endif - -static ssize_t -fb_read(struct file *file, char *buf, size_t count, loff_t *ppos) -{ - unsigned long p = *ppos; - struct inode *inode = file->f_dentry->d_inode; - int fbidx = GET_FB_IDX(inode->i_rdev); - struct fb_info *info = registered_fb[fbidx]; - struct fb_ops *fb = info->fbops; - struct fb_fix_screeninfo fix; - char *base_addr; - ssize_t copy_size; - - if (! fb || ! info->disp) - return -ENODEV; - - fb->fb_get_fix(&fix,PROC_CONSOLE(), info); - base_addr=info->disp->screen_base; - copy_size=(count + p <= fix.smem_len ? count : fix.smem_len - p); - if (copy_to_user(buf, base_addr+p, copy_size)) - return -EFAULT; - *ppos += copy_size; - return copy_size; -} - -static ssize_t -fb_write(struct file *file, const char *buf, size_t count, loff_t *ppos) -{ - unsigned long p = *ppos; - struct inode *inode = file->f_dentry->d_inode; - int fbidx = GET_FB_IDX(inode->i_rdev); - struct fb_info *info = registered_fb[fbidx]; - struct fb_ops *fb = info->fbops; - struct fb_fix_screeninfo fix; - char *base_addr; - ssize_t copy_size; - - if (! fb || ! info->disp) - return -ENODEV; - - fb->fb_get_fix(&fix, PROC_CONSOLE(), info); - base_addr=info->disp->screen_base; - copy_size=(count + p <= fix.smem_len ? count : fix.smem_len - p); - if (copy_from_user(base_addr+p, buf, copy_size)) - return -EFAULT; - file->f_pos += copy_size; - return copy_size; -} - - -static void set_con2fb_map(int unit, int newidx) -{ - int oldidx = con2fb_map[unit]; - struct fb_info *oldfb, *newfb; - struct vc_data *conp; - char *fontdata; - unsigned short fontwidth, fontheight, fontwidthlog, fontheightlog; - int userfont; - - if (newidx != con2fb_map[unit]) { - oldfb = registered_fb[oldidx]; - newfb = registered_fb[newidx]; - if (newfb->fbops->fb_open(newfb,0)) - return; - oldfb->fbops->fb_release(oldfb,0); - conp = fb_display[unit].conp; - fontdata = fb_display[unit].fontdata; - fontwidth = fb_display[unit]._fontwidth; - fontheight = fb_display[unit]._fontheight; - fontwidthlog = fb_display[unit]._fontwidthlog; - fontheightlog = fb_display[unit]._fontheightlog; - userfont = fb_display[unit].userfont; - con2fb_map[unit] = newidx; - fb_display[unit] = *(newfb->disp); - fb_display[unit].conp = conp; - fb_display[unit].fontdata = fontdata; - fb_display[unit]._fontwidth = fontwidth; - fb_display[unit]._fontheight = fontheight; - fb_display[unit]._fontwidthlog = fontwidthlog; - fb_display[unit]._fontheightlog = fontheightlog; - fb_display[unit].userfont = userfont; - fb_display[unit].fb_info = newfb; - if (!newfb->changevar) - newfb->changevar = oldfb->changevar; - /* tell console var has changed */ - if (newfb->changevar) - newfb->changevar(unit); - } -} - -#ifdef CONFIG_KMOD -static void try_to_load(int fb) -{ - char modname[16]; - - sprintf(modname, "fb%d", fb); - request_module(modname); -} -#endif /* CONFIG_KMOD */ - -static int -fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, - unsigned long arg) -{ - int fbidx = GET_FB_IDX(inode->i_rdev); - struct fb_info *info = registered_fb[fbidx]; - struct fb_ops *fb = info->fbops; - struct fb_cmap cmap; - struct fb_var_screeninfo var; - struct fb_fix_screeninfo fix; - struct fb_con2fbmap con2fb; - int i; - - if (! fb) - return -ENODEV; - switch (cmd) { - case FBIOGET_VSCREENINFO: - if ((i = fb->fb_get_var(&var, PROC_CONSOLE(), info))) - return i; - return copy_to_user((void *) arg, &var, - sizeof(var)) ? -EFAULT : 0; - case FBIOPUT_VSCREENINFO: - if (copy_from_user(&var, (void *) arg, sizeof(var))) - return -EFAULT; - if ((i = fb->fb_set_var(&var, PROC_CONSOLE(), info))) - return i; - if (copy_to_user((void *) arg, &var, sizeof(var))) - return -EFAULT; - return 0; - case FBIOGET_FSCREENINFO: - if ((i = fb->fb_get_fix(&fix, PROC_CONSOLE(), info))) - return i; - return copy_to_user((void *) arg, &fix, sizeof(fix)) ? - -EFAULT : 0; - case FBIOPUTCMAP: - if (copy_from_user(&cmap, (void *) arg, sizeof(cmap))) - return -EFAULT; - return (fb->fb_set_cmap(&cmap, 0, PROC_CONSOLE(), info)); - case FBIOGETCMAP: - if (copy_from_user(&cmap, (void *) arg, sizeof(cmap))) - return -EFAULT; - return (fb->fb_get_cmap(&cmap, 0, PROC_CONSOLE(), info)); - case FBIOPAN_DISPLAY: - if (copy_from_user(&var, (void *) arg, sizeof(var))) - return -EFAULT; - if ((i=fb->fb_pan_display(&var, PROC_CONSOLE(), info))) - return i; - if (copy_to_user((void *) arg, &var, sizeof(var))) - return -EFAULT; - return i; - case FBIOGET_CON2FBMAP: - if (copy_from_user(&con2fb, (void *)arg, sizeof(con2fb))) - return -EFAULT; - if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) - return -EINVAL; - con2fb.framebuffer = con2fb_map[con2fb.console-1]; - return copy_to_user((void *)arg, &con2fb, - sizeof(con2fb)) ? -EFAULT : 0; - case FBIOPUT_CON2FBMAP: - if (copy_from_user(&con2fb, (void *)arg, sizeof(con2fb))) - return - EFAULT; - if (con2fb.console < 0 || con2fb.console > MAX_NR_CONSOLES) - return -EINVAL; - if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX) - return -EINVAL; -#ifdef CONFIG_KMOD - if (!registered_fb[con2fb.framebuffer]) - try_to_load(con2fb.framebuffer); -#endif /* CONFIG_KMOD */ - if (!registered_fb[con2fb.framebuffer]) - return -EINVAL; - if (con2fb.console != 0) - set_con2fb_map(con2fb.console-1, con2fb.framebuffer); - else - /* set them all */ - for (i = 0; i < MAX_NR_CONSOLES; i++) - set_con2fb_map(i, con2fb.framebuffer); - return 0; - default: - return fb->fb_ioctl(inode, file, cmd, arg, PROC_CONSOLE(), - info); - } -} - -static int -fb_mmap(struct file *file, struct vm_area_struct * vma) -{ - int fbidx = GET_FB_IDX(file->f_dentry->d_inode->i_rdev); - struct fb_info *info = registered_fb[fbidx]; - struct fb_ops *fb = info->fbops; - struct fb_fix_screeninfo fix; - struct fb_var_screeninfo var; - unsigned long start; - u32 len; - - if (!fb) - return -ENODEV; - if (fb->fb_mmap) - return fb->fb_mmap(info, file, vma); - fb->fb_get_fix(&fix, PROC_CONSOLE(), info); - - /* frame buffer memory */ - start = (unsigned long)fix.smem_start; - len = (start & ~PAGE_MASK)+fix.smem_len; - start &= PAGE_MASK; - len = (len+~PAGE_MASK) & PAGE_MASK; - if (vma->vm_offset >= len) { - /* memory mapped io */ - vma->vm_offset -= len; - fb->fb_get_var(&var, PROC_CONSOLE(), info); - if (var.accel_flags) - return -EINVAL; - start = (unsigned long)fix.mmio_start; - len = (start & ~PAGE_MASK)+fix.mmio_len; - start &= PAGE_MASK; - len = (len+~PAGE_MASK) & PAGE_MASK; - } - if ((vma->vm_end - vma->vm_start + vma->vm_offset) > len) - return -EINVAL; - vma->vm_offset += start; - if (vma->vm_offset & ~PAGE_MASK) - return -ENXIO; -#if defined(__mc68000__) - if (CPU_IS_020_OR_030) - pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030; - if (CPU_IS_040_OR_060) { - pgprot_val(vma->vm_page_prot) &= _CACHEMASK040; - /* Use no-cache mode, serialized */ - pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S; - } -#elif defined(__powerpc__) - pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE|_PAGE_GUARDED; -#elif defined(__alpha__) - /* Caching is off in the I/O space quadrant by design. */ -#elif defined(__sparc__) - /* Should never get here, all fb drivers should have their own - mmap routines */ -#elif defined(__i386__) - if (boot_cpu_data.x86 > 3) - pgprot_val(vma->vm_page_prot) |= _PAGE_PCD; -#else -#warning What do we have to do here?? -#endif - if (remap_page_range(vma->vm_start, vma->vm_offset, - vma->vm_end - vma->vm_start, vma->vm_page_prot)) - return -EAGAIN; - vma->vm_file = file; - file->f_count++; - return 0; -} - -static int -fb_open(struct inode *inode, struct file *file) -{ - int fbidx = GET_FB_IDX(inode->i_rdev); - struct fb_info *info; - -#ifdef CONFIG_KMOD - if (!(info = registered_fb[fbidx])) - try_to_load(fbidx); -#endif /* CONFIG_KMOD */ - if (!(info = registered_fb[fbidx])) - return -ENODEV; - return info->fbops->fb_open(info,1); -} - -static int -fb_release(struct inode *inode, struct file *file) -{ - int fbidx = GET_FB_IDX(inode->i_rdev); - struct fb_info *info = registered_fb[fbidx]; - - info->fbops->fb_release(info,1); - return 0; -} - -static struct file_operations fb_fops = { - NULL, /* lseek */ - fb_read, /* read */ - fb_write, /* write */ - NULL, /* readdir */ - NULL, /* poll */ - fb_ioctl, /* ioctl */ - fb_mmap, /* mmap */ - fb_open, /* open */ - NULL, /* flush */ - fb_release, /* release */ - NULL /* fsync */ -}; - -int -register_framebuffer(struct fb_info *fb_info) -{ - int i, j; - static int fb_ever_opened[FB_MAX]; - static int first = 1; - - if (num_registered_fb == FB_MAX) - return -ENXIO; - num_registered_fb++; - for (i = 0 ; i < FB_MAX; i++) - if (!registered_fb[i]) - break; - fb_info->node = i; - registered_fb[i] = fb_info; - if (!fb_ever_opened[i]) { - /* - * We assume initial frame buffer devices can be opened this - * many times - */ - for (j = 0; j < MAX_NR_CONSOLES; j++) - if (con2fb_map[j] == i) - fb_info->fbops->fb_open(fb_info,0); - fb_ever_opened[i] = 1; - } - - if (first) { - first = 0; - take_over_console(&fb_con, 0, MAX_NR_CONSOLES-1, 1); - } - - return 0; -} - -int -unregister_framebuffer(const struct fb_info *fb_info) -{ - int i, j; - - i = fb_info->node; - for (j = 0; j < MAX_NR_CONSOLES; j++) - if (con2fb_map[j] == i) - return -EBUSY; - if (!registered_fb[i]) - return -EINVAL; - registered_fb[i]=NULL; - num_registered_fb--; - return 0; -} - -#ifdef CONFIG_PROC_FS -static struct proc_dir_entry *proc_fbmem; -#endif - -__initfunc(void -fbmem_init(void)) -{ - int i; - -#ifdef CONFIG_PROC_FS - proc_fbmem = create_proc_entry("fb", 0, 0); - if (proc_fbmem) - proc_fbmem->read_proc = fbmem_read_proc; -#endif - - if (register_chrdev(FB_MAJOR,"fb",&fb_fops)) - printk("unable to get major %d for fb devs\n", FB_MAJOR); - - /* - * Probe for all builtin frame buffer devices - */ - for (i = 0; i < num_pref_init_funcs; i++) - pref_init_funcs[i](); - - for (i = 0; i < NUM_FB_DRIVERS; i++) - if (fb_drivers[i].init) - fb_drivers[i].init(); -} - - -int fbmon_valid_timings(u_int pixclock, u_int htotal, u_int vtotal, - const struct fb_info *fb_info) -{ -#if 0 - /* - * long long divisions .... $#%%#$ - */ - unsigned long long hpicos, vpicos; - const unsigned long long _1e12 = 1000000000000ULL; - const struct fb_monspecs *monspecs = &fb_info->monspecs; - - hpicos = (unsigned long long)htotal*(unsigned long long)pixclock; - vpicos = (unsigned long long)vtotal*(unsigned long long)hpicos; - if (!vpicos) - return 0; - - if (monspecs->hfmin == 0) - return 1; - - if (hpicos*monspecs->hfmin > _1e12 || hpicos*monspecs->hfmax < _1e12 || - vpicos*monspecs->vfmin > _1e12 || vpicos*monspecs->vfmax < _1e12) - return 0; -#endif - return 1; -} - -int fbmon_dpms(const struct fb_info *fb_info) -{ - return fb_info->monspecs.dpms; -} - - - /* - * Command line options - */ - -__initfunc(void video_setup(char *options, int *ints)) -{ - int i, j; - - if (!options || !*options) - return; - - if (!strncmp(options, "map:", 4)) { - options += 4; - if (*options) - for (i = 0, j = 0; i < MAX_NR_CONSOLES; i++) { - if (!options[j]) - j = 0; - con2fb_map[i] = (options[j++]-'0') % FB_MAX; - } - return; - } - - if (num_pref_init_funcs == FB_MAX) - return; - - for (i = 0; i < NUM_FB_DRIVERS; i++) { - j = strlen(fb_drivers[i].name); - if (!strncmp(options, fb_drivers[i].name, j) && - options[j] == ':') { - if (!strcmp(options+j+1, "off")) - fb_drivers[i].init = NULL; - else { - if (fb_drivers[i].init) { - pref_init_funcs[num_pref_init_funcs++] = - fb_drivers[i].init; - fb_drivers[i].init = NULL; - } - if (fb_drivers[i].setup) - fb_drivers[i].setup(options+j+1, ints); - } - return; - } - } - /* - * If we get here no fb was specified and we default to pass the - * options to the first frame buffer that has an init and a setup - * function. - */ - for (i = 0; i < NUM_FB_DRIVERS; i++) { - if (fb_drivers[i].init && fb_drivers[i].setup) { - pref_init_funcs[num_pref_init_funcs++] = - fb_drivers[i].init; - fb_drivers[i].init = NULL; - - fb_drivers[i].setup(options, ints); - return; - } - } -} - - - /* - * Visible symbols for modules - */ - -EXPORT_SYMBOL(register_framebuffer); -EXPORT_SYMBOL(unregister_framebuffer); diff -u --recursive --exclude-from=/home/geert/diff-excludes-linux --new-file jes-2.1.119/drivers/char/selection.c m68k/drivers/char/selection.c --- jes-2.1.119/drivers/char/selection.c Mon Aug 10 09:24:55 1998 +++ m68k/drivers/char/selection.c Mon Aug 31 21:08:30 1998 @@ -123,7 +123,7 @@ int i, ps, pe; unsigned int currcons = fg_console; - do_unblank_screen(); + unblank_screen(); poke_blanked_console(); { unsigned short *args, xs, ys, xe, ye; diff -u --recursive --exclude-from=/home/geert/diff-excludes-linux --new-file jes-2.1.119/drivers/char/vt.c m68k/drivers/char/vt.c --- jes-2.1.119/drivers/char/vt.c Sun Aug 30 20:40:42 1998 +++ m68k/drivers/char/vt.c Mon Aug 31 21:29:35 1998 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -82,45 +83,6 @@ #define GPNUM (GPLAST - GPFIRST + 1) /* - * This function is called when the size of the physical screen has been - * changed. If either the row or col argument is nonzero, set the appropriate - * entry in each winsize structure for all the virtual consoles, then - * send SIGWINCH to all processes with a virtual console as controlling - * tty. - */ - -static int -kd_size_changed(int row, int col) -{ - struct task_struct *p; - int i; - - if ( !row && !col ) return 0; - - for ( i = 0 ; i < MAX_NR_CONSOLES ; i++ ) - { - if ( console_driver.table[i] ) - { - if ( row ) console_driver.table[i]->winsize.ws_row = row; - if ( col ) console_driver.table[i]->winsize.ws_col = col; - } - } - - read_lock(&tasklist_lock); - for_each_task(p) - { - if ( p->tty && MAJOR(p->tty->device) == TTY_MAJOR && - MINOR(p->tty->device) <= MAX_NR_CONSOLES && MINOR(p->tty->device) ) - { - send_sig(SIGWINCH, p, 1); - } - } - read_unlock(&tasklist_lock); - - return 0; -} - -/* * Generates sound of some frequency for some number of clock ticks * * If freq is 0, will turn off sound, else will turn it on for that time. @@ -621,7 +583,7 @@ * explicitly blank/unblank the screen if switching modes */ if (arg == KD_TEXT) - do_unblank_screen(); + unblank_screen(); else do_blank_screen(1); return 0; @@ -961,8 +923,7 @@ return i; __get_user(ll, &vtsizes->v_rows); __get_user(cc, &vtsizes->v_cols); - i = vc_resize_all(ll, cc); - return i ? i : kd_size_changed(ll, cc); + return vc_resize_all(ll, cc); } case VT_RESIZEX: @@ -1010,12 +971,7 @@ if ( clin ) video_font_height = clin; - i = vc_resize_all(ll, cc); - if (i) - return i; - - kd_size_changed(ll, cc); - return 0; + return vc_resize_all(ll, cc); } case PIO_FONT: { @@ -1269,7 +1225,7 @@ * unblank the screen later. */ old_vc_mode = vt_cons[fg_console]->vc_mode; - update_screen(new_console); + switch_screen(new_console); /* * If this new console is under process control, send it a signal @@ -1307,14 +1263,10 @@ if (old_vc_mode != vt_cons[new_console]->vc_mode) { if (vt_cons[new_console]->vc_mode == KD_TEXT) - do_unblank_screen(); + unblank_screen(); else do_blank_screen(1); } - - /* Set the colour palette for this VT */ - if (vt_cons[new_console]->vc_mode == KD_TEXT) - set_palette() ; /* * Wake anyone waiting for their VT to activate diff -u --recursive --exclude-from=/home/geert/diff-excludes-linux --new-file jes-2.1.119/drivers/video/Config.in m68k/drivers/video/Config.in --- jes-2.1.119/drivers/video/Config.in Sun Aug 30 20:40:50 1998 +++ m68k/drivers/video/Config.in Mon Aug 31 00:46:02 1998 @@ -35,7 +35,7 @@ if [ "$CONFIG_FB_OF" = "y" ]; then bool 'Apple "control" display support' CONFIG_FB_CONTROL bool 'Apple "platinum" display support' CONFIG_FB_PLATINUM -# bool 'Apple "valkyrie" display support' CONFIG_FB_VALKYRIE + bool 'Apple "valkyrie" display support' CONFIG_FB_VALKYRIE bool 'ATI Mach64 display support' CONFIG_FB_ATY bool 'IMS Twin Turbo display support' CONFIG_FB_IMSTT bool 'Chips 65550 display support' CONFIG_FB_CT65550 @@ -48,21 +48,12 @@ if [ "$CONFIG_HP300" = "y" ]; then define_bool CONFIG_FB_HP300 y fi - # I used CONFIG_ARM here because the ARCH construct doesn't seem to work - # with xconfig. --pb - if [ "$ARCH" = "i386" -o "$ARCH" = "alpha" -o "$ARCH" = "ppc" -o \ - "$CONFIG_ARM" = "y" ]; then - if [ "$CONFIG_ARM" != "y" -o "$CONFIG_ARCH_ACORN" != "y" ] ; then - tristate 'Deprecated almost-VGA support (text only - use normal VGA console instead)' CONFIG_FB_VGA - fi - fi if [ "$ARCH" = "alpha" ]; then tristate 'TGA framebuffer support' CONFIG_FB_TGA fi if [ "$ARCH" = "i386" ]; then bool 'VESA VGA graphics console' CONFIG_FB_VESA define_bool CONFIG_VIDEO_SELECT y - tristate 'MDA dual-headed support' CONFIG_FB_MDA fi if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then bool 'SBUS and UPA framebuffers' CONFIG_FB_SBUS @@ -141,28 +132,33 @@ "$CONFIG_FB_VESA" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" -o \ "$CONFIG_FB_TCX" = "y" -o "$CONFIG_FB_CGTHREE" = "y" -o \ "$CONFIG_FB_CONTROL" = "y" -o "$CONFIG_FB_CLGEN" = "y" -o \ - "$CONFIG_FB_HP300" = "y" ]; then + "$CONFIG_FB_CGFOURTEEN" = "y" -o \ + "$CONFIG_FB_VALKYRIE" = "y" ]; then define_bool CONFIG_FBCON_CFB8 y else if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_ATARI" = "m" -o \ - "$CONFIG_FB_ATY" = "y" -o "$CONFIG_FB_MAC" = "y" -o \ + "$CONFIG_FB_ATY" = "m" -o "$CONFIG_FB_MAC" = "m" -o \ "$CONFIG_FB_OF" = "m" -o "$CONFIG_FB_TGA" = "m" -o \ "$CONFIG_FB_VESA" = "m" -o "$CONFIG_FB_VIRTUAL" = "m" -o \ "$CONFIG_FB_TCX" = "m" -o "$CONFIG_FB_CGTHREE" = "m" -o \ - "$CONFIG_FB_CONTROL" = "m" ]; then + "$CONFIG_FB_CONTROL" = "m" -o "$CONFIG_FB_CLGEN" = "m" -o \ + "$CONFIG_FB_CGFOURTEEN" = "m" -o \ + "$CONFIG_FB_VALKYRIE" = "m" ]; then define_bool CONFIG_FBCON_CFB8 m fi fi if [ "$CONFIG_FB_ATARI" = "y" -o "$CONFIG_FB_ATY" = "y" -o \ "$CONFIG_FB_MAC" = "y" -o "$CONFIG_FB_VESA" = "y" -o \ "$CONFIG_FB_VIRTUAL" = "y" -o "$CONFIG_FB_TBOX" = "y" -o \ - "$CONFIG_FB_CONTROL" = "y" -o "$CONFIG_FB_CLGEN" = "y" ]; then + "$CONFIG_FB_CONTROL" = "y" -o "$CONFIG_FB_CLGEN" = "y" -o \ + "$CONFIG_FB_VALKYRIE" = "y" ]; then define_bool CONFIG_FBCON_CFB16 y else if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \ "$CONFIG_FB_MAC" = "m" -o "$CONFIG_FB_VESA" = "m" -o \ "$CONFIG_FB_VIRTUAL" = "m" -o "$CONFIG_FB_TBOX" = "m" -o \ - "$CONFIG_FB_CONTROL" = "m" -o "$CONFIG_FB_CLGEN" = "m" ]; then + "$CONFIG_FB_CONTROL" = "m" -o "$CONFIG_FB_CLGEN" = "m" -o \ + "$CONFIG_FB_VALKYRIE" = "m" ]; then define_bool CONFIG_FBCON_CFB16 m fi fi diff -u --recursive --exclude-from=/home/geert/diff-excludes-linux --new-file jes-2.1.119/drivers/video/Makefile m68k/drivers/video/Makefile --- jes-2.1.119/drivers/video/Makefile Sun Aug 30 20:40:50 1998 +++ m68k/drivers/video/Makefile Mon Aug 31 00:46:02 1998 @@ -9,9 +9,6 @@ # parent makes.. # -GSPA = gspa -GSPH2C = gspahextoc - L_TARGET := video.a L_OBJS := M_OBJS := @@ -19,6 +16,9 @@ MX_OBJS := MOD_LIST_NAME := VIDEO_MODULES +CONFIG_FBGEN_BUILTIN := +CONFIG_FBGEN_MODULE := + # Frame Buffer Console ifeq ($(CONFIG_FB),y) @@ -37,8 +37,7 @@ ifeq ($(CONFIG_FB),y) L_OBJS += fonts.o - OX_OBJS += fbcon.o fbcmap.o -# fbgen is not compiled by default since nobody uses it yet, except clgenfb + OX_OBJS += fbcon.o fbcmap.o fbmem.o ifeq ($(CONFIG_FONT_8x8),y) L_OBJS += font_8x8.o endif @@ -104,6 +103,10 @@ L_OBJS += platinumfb.o endif +ifeq ($(CONFIG_FB_VALKYRIE),y) +L_OBJS += valkyriefb.o +endif + ifeq ($(CONFIG_FB_CT65550),y) L_OBJS += chipsfb.o endif @@ -142,11 +145,11 @@ ifeq ($(CONFIG_FB_CLGEN),y) L_OBJS += clgenfb.o -OX_OBJS += fbgen.o +CONFIG_FBGEN_BUILTIN = y else ifeq ($(CONFIG_FB_CLGEN),m) M_OBJS += clgenfb.o - OX_OBJS += fbgen.o + CONFIG_FBGEN_MODULE = y endif endif @@ -166,26 +169,10 @@ endif endif -ifeq ($(CONFIG_FB_VGA),y) -L_OBJS += vgafb.o -else - ifeq ($(CONFIG_FB_VGA),m) - M_OBJS += vgafb.o - endif -endif - ifeq ($(CONFIG_FB_VESA),y) L_OBJS += vesafb.o endif -ifeq ($(CONFIG_FB_MDA),y) -L_OBJS += mdafb.o -else - ifeq ($(CONFIG_FB_MDA),m) - M_OBJS += mdafb.o - endif -endif - ifeq ($(CONFIG_FB_VIRGE),y) L_OBJS += virgefb.o else @@ -308,6 +295,14 @@ endif endif +ifdef CONFIG_FBGEN_BUILTIN +OX_OBJS += fbgen.o +else + ifdef CONFIG_FBGEN_MODULE + MX_OBJS += fbgen.o + endif +endif + # Generic Low Level Drivers ifeq ($(CONFIG_FBCON_AFB),y) @@ -430,12 +425,6 @@ endif endif -# GSP Console - -ifdef CONFIG_AMIGA_GSP -L_OBJS += gspcon.o gspcore.o -endif - # VGA Text Console ifdef CONFIG_VGA_CONSOLE @@ -443,10 +432,6 @@ endif include $(TOPDIR)/Rules.make - -gspcore.c: gspcore.gsp - $(GSPA) $< > $*.hex - $(GSPH2C) $*.hex > gspcore.c promcon_tbl.c: prom.uni ../char/conmakehash prom.uni | \ diff -u --recursive --exclude-from=/home/geert/diff-excludes-linux --new-file jes-2.1.119/drivers/video/S3triofb.c m68k/drivers/video/S3triofb.c --- jes-2.1.119/drivers/video/S3triofb.c Sun Aug 30 20:40:50 1998 +++ m68k/drivers/video/S3triofb.c Mon Aug 31 00:46:02 1998 @@ -45,9 +45,9 @@ #include #endif -#include "fbcon.h" -#include "fbcon-cfb8.h" -#include "s3blit.h" +#include