patch-2.1.129 linux/drivers/video/retz3fb.c

• Lines: 1161
• Date: Fri Nov 13 10:10:12 1998
• Orig file: v2.1.128/linux/drivers/video/retz3fb.c
• Orig date: Mon Oct 5 13:13:42 1998

diff -u --recursive --new-file v2.1.128/linux/drivers/video/retz3fb.c linux/drivers/video/retz3fb.c
@@ -36,6 +36,7 @@
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/pgtable.h>
+#include <asm/io.h>
 
 #include <video/fbcon.h>
 #include <video/fbcon-cfb8.h>
@@ -98,38 +99,26 @@
 	long v_dispend;		/* Horizontal Display End */
 };
 
-static struct retz3fb_par current_par;
-
-static int current_par_valid = 0;
-static int currcon = 0;
-
-static struct display disp;
-static struct fb_info fb_info;
-
-
-/*
- *    Switch for Chipset Independency
- */
-
-static struct fb_hwswitch {
-
-   /* Initialisation */
+struct retz3_fb_info {
+	struct fb_info info;
+	unsigned long base;
+	unsigned long fbmem;
+	unsigned long fbsize;
+	volatile unsigned char *regs;
+	unsigned long physfbmem;
+	unsigned long physregs;
+	int currcon;
+	int current_par_valid; /* set to 0 by memset */
+	struct display disp;
+	struct retz3fb_par current_par;
+	unsigned char color_table [256][3];
+};
 
-   int (*init)(void);
 
-   /* Display Control */
+static char fontname[40] __initdata = { 0 };
 
-   int (*encode_fix)(struct fb_fix_screeninfo *fix, struct retz3fb_par *par);
-   int (*decode_var)(struct fb_var_screeninfo *var, struct retz3fb_par *par);
-   int (*encode_var)(struct fb_var_screeninfo *var, struct retz3fb_par *par);
-   int (*getcolreg)(unsigned int regno, unsigned int *red, unsigned
-		    int *green, unsigned int *blue, unsigned int *transp,
-			struct fb_info *info);
-   int (*setcolreg)(unsigned int regno, unsigned int red, unsigned int
-		    green, unsigned int blue, unsigned int transp,
-			struct fb_info *info);
-   void (*blank)(int blank);
-} *fbhw;
+#define retz3info(info) ((struct retz3_fb_info *)(info))
+#define fbinfo(info) ((struct fb_info *)(info))
 
 
 /*
@@ -139,13 +128,6 @@
 static char retz3fb_name[16] = "RetinaZ3";
 
 
-static unsigned char retz3_color_table [256][3];
-static unsigned long z3_mem;
-static unsigned long z3_fbmem;
-static unsigned long z3_size;
-static volatile unsigned char *z3_regs;
-
-
 /*
  * A small info on how to convert XFree86 timing values into fb
  * timings - by Frank Neumann:
@@ -197,7 +179,7 @@
 	    640, 480, 640, 480, 0, 0, 8, 0,
 	    {0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0},
 	    0, 0, -1, -1, FB_ACCELF_TEXT, 38461, 28, 32, 12, 10, 96, 2,
-	    FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
+	    FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,FB_VMODE_NONINTERLACED
 	}
     },
     /*
@@ -228,14 +210,14 @@
 	    640, 480, 640, 480, 0, 0, 16, 0,
 	    {11, 5, 0}, {5, 6, 0}, {0, 5, 0}, {0, 0, 0},
 	    0, 0, -1, -1, 0, 38461/2, 28, 32, 12, 10, 96, 2,
-	    FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
+	    FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,FB_VMODE_NONINTERLACED
 	}
     }, {
 	"640x480-24", {		/* 640x480, 24 bpp */
 	    640, 480, 640, 480, 0, 0, 24, 0,
 	    {8, 8, 8}, {8, 8, 8}, {8, 8, 8}, {0, 0, 0},
 	    0, 0, -1, -1, 0, 38461/3, 28, 32, 12, 10, 96, 2,
-	    FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
+	    FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,FB_VMODE_NONINTERLACED
 	}
     },
 };
@@ -297,7 +279,7 @@
  *    Accelerated Functions used by the low level console driver
  */
 
-static void retz3_bitblt(struct fb_var_screeninfo *scr,
+static void retz3_bitblt(struct display *p,
 			 unsigned short curx, unsigned short cury, unsigned
 			 short destx, unsigned short desty, unsigned short
 			 width, unsigned short height, unsigned short cmd,
@@ -307,29 +289,28 @@
  *   Hardware Specific Routines
  */
 
-static int retz3_init(void);
-static int retz3_encode_fix(struct fb_fix_screeninfo *fix,
-                          struct retz3fb_par *par);
+static int retz3_encode_fix(struct fb_info *info,
+			    struct fb_fix_screeninfo *fix,
+			    struct retz3fb_par *par);
 static int retz3_decode_var(struct fb_var_screeninfo *var,
-                          struct retz3fb_par *par);
+			    struct retz3fb_par *par);
 static int retz3_encode_var(struct fb_var_screeninfo *var,
-                          struct retz3fb_par *par);
+			    struct retz3fb_par *par);
 static int retz3_getcolreg(unsigned int regno, unsigned int *red,
 			   unsigned int *green, unsigned int *blue,
 			   unsigned int *transp, struct fb_info *info);
 static int retz3_setcolreg(unsigned int regno, unsigned int red,
 			   unsigned int green, unsigned int blue,
 			   unsigned int transp, struct fb_info *info);
-static void retz3_blank(int blank);
-
 
 /*
  *    Internal routines
  */
 
-static void retz3fb_get_par(struct retz3fb_par *par);
-static void retz3fb_set_par(struct retz3fb_par *par);
-static int do_fb_set_var(struct fb_var_screeninfo *var, int isactive);
+static void retz3fb_get_par(struct fb_info *info, struct retz3fb_par *par);
+static void retz3fb_set_par(struct fb_info *info, struct retz3fb_par *par);
+static int do_fb_set_var(struct fb_info *info,
+			 struct fb_var_screeninfo *var, int isactive);
 static void do_install_cmap(int con, struct fb_info *info);
 static void retz3fb_set_disp(int con, struct fb_info *info);
 static int get_video_mode(const char *name);
@@ -381,12 +362,11 @@
 }
 
 
-static int retz3_set_video(struct fb_var_screeninfo *var,
+static int retz3_set_video(struct fb_info *info,
+			   struct fb_var_screeninfo *var,
 			   struct retz3fb_par *par)
 {
-#if 0
-	float freq_f;
-#endif
+	volatile unsigned char *regs = retz3info(info)->regs;
 	unsigned int freq;
 
 	int xres, hfront, hsync, hback;
@@ -482,11 +462,11 @@
 	if (data.v_total >= 1024)
 		printk("MAYDAY: v_total >= 1024; bailing out!\n");
 
-	reg_w(GREG_MISC_OUTPUT_W, 0xe3 | ((clocksel & 3) * 0x04));
-	reg_w(GREG_FEATURE_CONTROL_W, 0x00);
+	reg_w(regs, GREG_MISC_OUTPUT_W, 0xe3 | ((clocksel & 3) * 0x04));
+	reg_w(regs, GREG_FEATURE_CONTROL_W, 0x00);
 
-	seq_w(SEQ_RESET, 0x00);
-	seq_w(SEQ_RESET, 0x03);	/* reset sequencer logic */
+	seq_w(regs, SEQ_RESET, 0x00);
+	seq_w(regs, SEQ_RESET, 0x03);	/* reset sequencer logic */
 
 	/*
 	 * CLOCKING_MODE bits:
@@ -495,32 +475,32 @@
 	 * (The CL drivers sets it to 0x21 with the comment:
 	 *  FullBandwidth (video off) and 8/9 dot clock)
 	 */
-	seq_w(SEQ_CLOCKING_MODE, 0x01 | 0x00 /* 0x08 */);
+	seq_w(regs, SEQ_CLOCKING_MODE, 0x01 | 0x00 /* 0x08 */);
 
-	seq_w(SEQ_MAP_MASK, 0x0f);        /* enable writing to plane 0-3 */
-	seq_w(SEQ_CHAR_MAP_SELECT, 0x00); /* doesn't matter in gfx-mode */
-	seq_w(SEQ_MEMORY_MODE, 0x06); /* CL driver says 0x0e for 256 col mode*/
-	seq_w(SEQ_RESET, 0x01);
-	seq_w(SEQ_RESET, 0x03);
-
-	seq_w(SEQ_EXTENDED_ENABLE, 0x05);
-
-	seq_w(SEQ_CURSOR_CONTROL, 0x00);	/* disable cursor */
-	seq_w(SEQ_PRIM_HOST_OFF_HI, 0x00);
-	seq_w(SEQ_PRIM_HOST_OFF_HI, 0x00);
-	seq_w(SEQ_LINEAR_0, 0x4a);
-	seq_w(SEQ_LINEAR_1, 0x00);
-
-	seq_w(SEQ_SEC_HOST_OFF_HI, 0x00);
-	seq_w(SEQ_SEC_HOST_OFF_LO, 0x00);
-	seq_w(SEQ_EXTENDED_MEM_ENA, 0x3 | 0x4 | 0x10 | 0x40);
+	seq_w(regs, SEQ_MAP_MASK, 0x0f);        /* enable writing to plane 0-3 */
+	seq_w(regs, SEQ_CHAR_MAP_SELECT, 0x00); /* doesn't matter in gfx-mode */
+	seq_w(regs, SEQ_MEMORY_MODE, 0x06); /* CL driver says 0x0e for 256 col mode*/
+	seq_w(regs, SEQ_RESET, 0x01);
+	seq_w(regs, SEQ_RESET, 0x03);
+
+	seq_w(regs, SEQ_EXTENDED_ENABLE, 0x05);
+
+	seq_w(regs, SEQ_CURSOR_CONTROL, 0x00);	/* disable cursor */
+	seq_w(regs, SEQ_PRIM_HOST_OFF_HI, 0x00);
+	seq_w(regs, SEQ_PRIM_HOST_OFF_HI, 0x00);
+	seq_w(regs, SEQ_LINEAR_0, 0x4a);
+	seq_w(regs, SEQ_LINEAR_1, 0x00);
+
+	seq_w(regs, SEQ_SEC_HOST_OFF_HI, 0x00);
+	seq_w(regs, SEQ_SEC_HOST_OFF_LO, 0x00);
+	seq_w(regs, SEQ_EXTENDED_MEM_ENA, 0x3 | 0x4 | 0x10 | 0x40);
 
 	/*
 	 * The lower 4 bits (0-3) are used to set the font-width for
 	 * text-mode - DON'T try to set this for gfx-mode.
 	 */
-	seq_w(SEQ_EXT_CLOCK_MODE, 0x10);
-	seq_w(SEQ_EXT_VIDEO_ADDR, 0x03);
+	seq_w(regs, SEQ_EXT_CLOCK_MODE, 0x10);
+	seq_w(regs, SEQ_EXT_VIDEO_ADDR, 0x03);
 
 	/*
 	 * Extended Pixel Control:
@@ -528,52 +508,52 @@
 	 * bit 1: (Packed/Nibble Pixel Format ?)
 	 * bit 4-5: depth, 0=1-8bpp, 1=9-16bpp, 2=17-24bpp
 	 */
-	seq_w(SEQ_EXT_PIXEL_CNTL, 0x01 | (((bpp / 8) - 1) << 4));
+	seq_w(regs, SEQ_EXT_PIXEL_CNTL, 0x01 | (((bpp / 8) - 1) << 4));
 
-	seq_w(SEQ_BUS_WIDTH_FEEDB, 0x04);
-	seq_w(SEQ_COLOR_EXP_WFG, 0x01);
-	seq_w(SEQ_COLOR_EXP_WBG, 0x00);
-	seq_w(SEQ_EXT_RW_CONTROL, 0x00);
-	seq_w(SEQ_MISC_FEATURE_SEL, (0x51 | (clocksel & 8)));
-	seq_w(SEQ_COLOR_KEY_CNTL, 0x40);
-	seq_w(SEQ_COLOR_KEY_MATCH0, 0x00);
-	seq_w(SEQ_COLOR_KEY_MATCH1, 0x00);
-	seq_w(SEQ_COLOR_KEY_MATCH2, 0x00);
-	seq_w(SEQ_CRC_CONTROL, 0x00);
-	seq_w(SEQ_PERF_SELECT, 0x10);
-	seq_w(SEQ_ACM_APERTURE_1, 0x00);
-	seq_w(SEQ_ACM_APERTURE_2, 0x30);
-	seq_w(SEQ_ACM_APERTURE_3, 0x00);
-	seq_w(SEQ_MEMORY_MAP_CNTL, 0x03);
+	seq_w(regs, SEQ_BUS_WIDTH_FEEDB, 0x04);
+	seq_w(regs, SEQ_COLOR_EXP_WFG, 0x01);
+	seq_w(regs, SEQ_COLOR_EXP_WBG, 0x00);
+	seq_w(regs, SEQ_EXT_RW_CONTROL, 0x00);
+	seq_w(regs, SEQ_MISC_FEATURE_SEL, (0x51 | (clocksel & 8)));
+	seq_w(regs, SEQ_COLOR_KEY_CNTL, 0x40);
+	seq_w(regs, SEQ_COLOR_KEY_MATCH0, 0x00);
+	seq_w(regs, SEQ_COLOR_KEY_MATCH1, 0x00);
+	seq_w(regs, SEQ_COLOR_KEY_MATCH2, 0x00);
+	seq_w(regs, SEQ_CRC_CONTROL, 0x00);
+	seq_w(regs, SEQ_PERF_SELECT, 0x10);
+	seq_w(regs, SEQ_ACM_APERTURE_1, 0x00);
+	seq_w(regs, SEQ_ACM_APERTURE_2, 0x30);
+	seq_w(regs, SEQ_ACM_APERTURE_3, 0x00);
+	seq_w(regs, SEQ_MEMORY_MAP_CNTL, 0x03);
 
 
 	/* unlock register CRT0..CRT7 */
-	crt_w(CRT_END_VER_RETR, (data.v_sstop & 0x0f) | 0x20);
+	crt_w(regs, CRT_END_VER_RETR, (data.v_sstop & 0x0f) | 0x20);
 
 	/* Zuerst zu schreibende Werte nur per printk ausgeben */
 	DEBUG printk("CRT_HOR_TOTAL: %ld\n", data.h_total);
-	crt_w(CRT_HOR_TOTAL, data.h_total & 0xff);
+	crt_w(regs, CRT_HOR_TOTAL, data.h_total & 0xff);
 
 	DEBUG printk("CRT_HOR_DISP_ENA_END: %ld\n", data.h_dispend);
-	crt_w(CRT_HOR_DISP_ENA_END, (data.h_dispend) & 0xff);
+	crt_w(regs, CRT_HOR_DISP_ENA_END, (data.h_dispend) & 0xff);
 
 	DEBUG printk("CRT_START_HOR_BLANK: %ld\n", data.h_bstart);
-	crt_w(CRT_START_HOR_BLANK, data.h_bstart & 0xff);
+	crt_w(regs, CRT_START_HOR_BLANK, data.h_bstart & 0xff);
 
 	DEBUG printk("CRT_END_HOR_BLANK: 128+%ld\n", data.h_bstop % 32);
-	crt_w(CRT_END_HOR_BLANK,  0x80 | (data.h_bstop & 0x1f));
+	crt_w(regs, CRT_END_HOR_BLANK,  0x80 | (data.h_bstop & 0x1f));
 
 	DEBUG printk("CRT_START_HOR_RETR: %ld\n", data.h_sstart);
-	crt_w(CRT_START_HOR_RETR, data.h_sstart & 0xff);
+	crt_w(regs, CRT_START_HOR_RETR, data.h_sstart & 0xff);
 
 	tmp = (data.h_sstop & 0x1f);
 	if (data.h_bstop & 0x20)
 		tmp |= 0x80;
 	DEBUG printk("CRT_END_HOR_RETR: %d\n", tmp);
-	crt_w(CRT_END_HOR_RETR, tmp);
+	crt_w(regs, CRT_END_HOR_RETR, tmp);
 
 	DEBUG printk("CRT_VER_TOTAL: %ld\n", data.v_total & 0xff);
-	crt_w(CRT_VER_TOTAL, (data.v_total & 0xff));
+	crt_w(regs, CRT_VER_TOTAL, (data.v_total & 0xff));
 
 	tmp = 0x10;  /* LineCompare bit #9 */
 	if (data.v_total & 256)
@@ -591,9 +571,9 @@
 	if (data.v_sstart & 512)
 		tmp |= 0x80;
 	DEBUG printk("CRT_OVERFLOW: %d\n", tmp);
-	crt_w(CRT_OVERFLOW, tmp);
+	crt_w(regs, CRT_OVERFLOW, tmp);
 
-	crt_w(CRT_PRESET_ROW_SCAN, 0x00); /* not CL !!! */
+	crt_w(regs, CRT_PRESET_ROW_SCAN, 0x00); /* not CL !!! */
 
 	tmp = 0x40; /* LineCompare bit #8 */
 	if (data.v_bstart & 512)
@@ -601,47 +581,47 @@
 	if (var->vmode & FB_VMODE_DOUBLE)
 		tmp |= 0x80;
  	DEBUG printk("CRT_MAX_SCAN_LINE: %d\n", tmp);
-	crt_w(CRT_MAX_SCAN_LINE, tmp);
+	crt_w(regs, CRT_MAX_SCAN_LINE, tmp);
 
-	crt_w(CRT_CURSOR_START, 0x00);
-	crt_w(CRT_CURSOR_END, 8 & 0x1f); /* font height */
+	crt_w(regs, CRT_CURSOR_START, 0x00);
+	crt_w(regs, CRT_CURSOR_END, 8 & 0x1f); /* font height */
 
-	crt_w(CRT_START_ADDR_HIGH, 0x00);
-	crt_w(CRT_START_ADDR_LOW, 0x00);
+	crt_w(regs, CRT_START_ADDR_HIGH, 0x00);
+	crt_w(regs, CRT_START_ADDR_LOW, 0x00);
 
-	crt_w(CRT_CURSOR_LOC_HIGH, 0x00);
-	crt_w(CRT_CURSOR_LOC_LOW, 0x00);
+	crt_w(regs, CRT_CURSOR_LOC_HIGH, 0x00);
+	crt_w(regs, CRT_CURSOR_LOC_LOW, 0x00);
 
  	DEBUG printk("CRT_START_VER_RETR: %ld\n", data.v_sstart & 0xff);
-	crt_w(CRT_START_VER_RETR, (data.v_sstart & 0xff));
+	crt_w(regs, CRT_START_VER_RETR, (data.v_sstart & 0xff));
 
 #if 1
 	/* 5 refresh cycles per scanline */
 	DEBUG printk("CRT_END_VER_RETR: 64+32+%ld\n", data.v_sstop % 16);
-	crt_w(CRT_END_VER_RETR, ((data.v_sstop & 0x0f) | 0x40 | 0x20));
+	crt_w(regs, CRT_END_VER_RETR, ((data.v_sstop & 0x0f) | 0x40 | 0x20));
 #else
 	DEBUG printk("CRT_END_VER_RETR: 128+32+%ld\n", data.v_sstop % 16);
-	crt_w(CRT_END_VER_RETR, ((data.v_sstop & 0x0f) | 128 | 32));
+	crt_w(regs, CRT_END_VER_RETR, ((data.v_sstop & 0x0f) | 128 | 32));
 #endif
 	DEBUG printk("CRT_VER_DISP_ENA_END: %ld\n", data.v_dispend & 0xff);
-	crt_w(CRT_VER_DISP_ENA_END, (data.v_dispend & 0xff));
+	crt_w(regs, CRT_VER_DISP_ENA_END, (data.v_dispend & 0xff));
 
 	DEBUG printk("CRT_START_VER_BLANK: %ld\n", data.v_bstart & 0xff);
-	crt_w(CRT_START_VER_BLANK, (data.v_bstart & 0xff));
+	crt_w(regs, CRT_START_VER_BLANK, (data.v_bstart & 0xff));
 
 	DEBUG printk("CRT_END_VER_BLANK: %ld\n", data.v_bstop & 0xff);
-	crt_w(CRT_END_VER_BLANK, (data.v_bstop & 0xff));
+	crt_w(regs, CRT_END_VER_BLANK, (data.v_bstop & 0xff));
 
 	DEBUG printk("CRT_MODE_CONTROL: 0xe3\n");
-	crt_w(CRT_MODE_CONTROL, 0xe3);
+	crt_w(regs, CRT_MODE_CONTROL, 0xe3);
 
 	DEBUG printk("CRT_LINE_COMPARE: 0xff\n");
-	crt_w(CRT_LINE_COMPARE, 0xff);
+	crt_w(regs, CRT_LINE_COMPARE, 0xff);
 
 	tmp = (var->xres_virtual / 8) * (bpp / 8);
-	crt_w(CRT_OFFSET, tmp);
+	crt_w(regs, CRT_OFFSET, tmp);
 
-	crt_w(CRT_UNDERLINE_LOC, 0x07); /* probably font-height - 1 */
+	crt_w(regs, CRT_UNDERLINE_LOC, 0x07); /* probably font-height - 1 */
 
 	tmp = 0x20;			/* Enable extended end bits */
 	if (data.h_total & 0x100)
@@ -655,12 +635,12 @@
 	if (var->vmode & FB_VMODE_INTERLACED)
 		tmp |= 0x10;
  	DEBUG printk("CRT_EXT_HOR_TIMING1: %d\n", tmp);
-	crt_w(CRT_EXT_HOR_TIMING1, tmp);
+	crt_w(regs, CRT_EXT_HOR_TIMING1, tmp);
 
 	tmp = 0x00;
 	if (((var->xres_virtual / 8) * (bpp / 8)) & 0x100)
 		tmp |= 0x10;
-	crt_w(CRT_EXT_START_ADDR, tmp);
+	crt_w(regs, CRT_EXT_START_ADDR, tmp);
 
 	tmp = 0x00;
 	if (data.h_total & 0x200)
@@ -673,7 +653,7 @@
 		tmp |= 0x08;
 	tmp |= ((data.h_bstop & 0xc0) >> 2);
 	tmp |= ((data.h_sstop & 0x60) << 1);
-	crt_w(CRT_EXT_HOR_TIMING2, tmp);
+	crt_w(regs, CRT_EXT_HOR_TIMING2, tmp);
  	DEBUG printk("CRT_EXT_HOR_TIMING2: %d\n", tmp);
 
 	tmp = 0x10;			/* Line compare bit 10 */
@@ -688,138 +668,84 @@
 	tmp |= ((data.v_bstop & 0x300) >> 3);
 	if (data.v_sstop & 0x10)
 		tmp |= 0x80;
-	crt_w(CRT_EXT_VER_TIMING, tmp);
+	crt_w(regs, CRT_EXT_VER_TIMING, tmp);
  	DEBUG printk("CRT_EXT_VER_TIMING: %d\n", tmp);
 
-	crt_w(CRT_MONITOR_POWER, 0x00);
+	crt_w(regs, CRT_MONITOR_POWER, 0x00);
 
 	/*
 	 * Convert from ps to Hz.
 	 */
-#if 0
-	freq_f = (1.0/(float)var->pixclock) * 1000000000;
-	freq = ((unsigned int)freq_f) * 1000;
-#else
 	freq = 2000000000 / var->pixclock;
 	freq = freq * 500;
-#endif
 
 	best_freq = find_fq(freq);
-	pll_w(0x02, best_freq);
+	pll_w(regs, 0x02, best_freq);
 	best_freq = find_fq(61000000);
-	pll_w(0x0a, best_freq);
-	pll_w(0x0e, 0x22);
+	pll_w(regs, 0x0a, best_freq);
+	pll_w(regs, 0x0e, 0x22);
 
-	gfx_w(GFX_SET_RESET, 0x00);
-	gfx_w(GFX_ENABLE_SET_RESET, 0x00);
-	gfx_w(GFX_COLOR_COMPARE, 0x00);
-	gfx_w(GFX_DATA_ROTATE, 0x00);
-	gfx_w(GFX_READ_MAP_SELECT, 0x00);
-	gfx_w(GFX_GRAPHICS_MODE, 0x00);
-	gfx_w(GFX_MISC, 0x05);
-	gfx_w(GFX_COLOR_XCARE, 0x0f);
-	gfx_w(GFX_BITMASK, 0xff);
-
-	reg_r(ACT_ADDRESS_RESET);
-	attr_w(ACT_PALETTE0 , 0x00);
-	attr_w(ACT_PALETTE1 , 0x01);
-	attr_w(ACT_PALETTE2 , 0x02);
-	attr_w(ACT_PALETTE3 , 0x03);
-	attr_w(ACT_PALETTE4 , 0x04);
-	attr_w(ACT_PALETTE5 , 0x05);
-	attr_w(ACT_PALETTE6 , 0x06);
-	attr_w(ACT_PALETTE7 , 0x07);
-	attr_w(ACT_PALETTE8 , 0x08);
-	attr_w(ACT_PALETTE9 , 0x09);
-	attr_w(ACT_PALETTE10, 0x0a);
-	attr_w(ACT_PALETTE11, 0x0b);
-	attr_w(ACT_PALETTE12, 0x0c);
-	attr_w(ACT_PALETTE13, 0x0d);
-	attr_w(ACT_PALETTE14, 0x0e);
-	attr_w(ACT_PALETTE15, 0x0f);
-	reg_r(ACT_ADDRESS_RESET);
-
-	attr_w(ACT_ATTR_MODE_CNTL, 0x09); /* 0x01 for CL */
-
-	attr_w(ACT_OVERSCAN_COLOR, 0x00);
-	attr_w(ACT_COLOR_PLANE_ENA, 0x0f);
-	attr_w(ACT_HOR_PEL_PANNING, 0x00);
-	attr_w(ACT_COLOR_SELECT, 0x00);
+	gfx_w(regs, GFX_SET_RESET, 0x00);
+	gfx_w(regs, GFX_ENABLE_SET_RESET, 0x00);
+	gfx_w(regs, GFX_COLOR_COMPARE, 0x00);
+	gfx_w(regs, GFX_DATA_ROTATE, 0x00);
+	gfx_w(regs, GFX_READ_MAP_SELECT, 0x00);
+	gfx_w(regs, GFX_GRAPHICS_MODE, 0x00);
+	gfx_w(regs, GFX_MISC, 0x05);
+	gfx_w(regs, GFX_COLOR_XCARE, 0x0f);
+	gfx_w(regs, GFX_BITMASK, 0xff);
+
+	reg_r(regs, ACT_ADDRESS_RESET);
+	attr_w(regs, ACT_PALETTE0 , 0x00);
+	attr_w(regs, ACT_PALETTE1 , 0x01);
+	attr_w(regs, ACT_PALETTE2 , 0x02);
+	attr_w(regs, ACT_PALETTE3 , 0x03);
+	attr_w(regs, ACT_PALETTE4 , 0x04);
+	attr_w(regs, ACT_PALETTE5 , 0x05);
+	attr_w(regs, ACT_PALETTE6 , 0x06);
+	attr_w(regs, ACT_PALETTE7 , 0x07);
+	attr_w(regs, ACT_PALETTE8 , 0x08);
+	attr_w(regs, ACT_PALETTE9 , 0x09);
+	attr_w(regs, ACT_PALETTE10, 0x0a);
+	attr_w(regs, ACT_PALETTE11, 0x0b);
+	attr_w(regs, ACT_PALETTE12, 0x0c);
+	attr_w(regs, ACT_PALETTE13, 0x0d);
+	attr_w(regs, ACT_PALETTE14, 0x0e);
+	attr_w(regs, ACT_PALETTE15, 0x0f);
+	reg_r(regs, ACT_ADDRESS_RESET);
+
+	attr_w(regs, ACT_ATTR_MODE_CNTL, 0x09); /* 0x01 for CL */
+
+	attr_w(regs, ACT_OVERSCAN_COLOR, 0x00);
+	attr_w(regs, ACT_COLOR_PLANE_ENA, 0x0f);
+	attr_w(regs, ACT_HOR_PEL_PANNING, 0x00);
+	attr_w(regs, ACT_COLOR_SELECT, 0x00);
 
-	reg_r(ACT_ADDRESS_RESET);
-	reg_w(ACT_DATA, 0x20);
+	reg_r(regs, ACT_ADDRESS_RESET);
+	reg_w(regs, ACT_DATA, 0x20);
 
-	reg_w(VDAC_MASK, 0xff);
+	reg_w(regs, VDAC_MASK, 0xff);
 
 	/*
 	 * Extended palette adressing ???
 	 */
 	switch (bpp){
 	case 8:
-		reg_w(0x83c6, 0x00);
+		reg_w(regs, 0x83c6, 0x00);
 		break;
 	case 16:
-		reg_w(0x83c6, 0x60);
+		reg_w(regs, 0x83c6, 0x60);
 		break;
 	case 24:
-		reg_w(0x83c6, 0xe0);
+		reg_w(regs, 0x83c6, 0xe0);
 		break;
 	default:
 		printk("Illegal color-depth: %i\n", bpp);
 	}
 
-	reg_w(VDAC_ADDRESS, 0x00);
-
-	seq_w(SEQ_MAP_MASK, 0x0f );
-
-	return 0;
-}
-
-/*
- *    Initialization
- *
- *    Set the default video mode for this chipset. If a video mode was
- *    specified on the command line, it will override the default mode.
- */
-
-static int retz3_init(void)
-{
-	short i;
-#if 0
-	volatile unsigned long *CursorBase;
-#endif
-
-	for (i = 0; i < 256; i++){
-		for (i = 0; i < 256; i++){
-			retz3_color_table [i][0] = i;
-			retz3_color_table [i][1] = i;
-			retz3_color_table [i][2] = i;
-		}
-	}
-
-	/* Disable hardware cursor */
+	reg_w(regs, VDAC_ADDRESS, 0x00);
 
-	seq_w(SEQ_CURSOR_Y_INDEX, 0x00);
-
-#if 0
-	/* Initialize hardware cursor */
-	CursorBase = (unsigned long *)((char *)(z3_mem) + z3_size - 0x400);
-	for (i=0; i < 8; i++){
-		*(CursorBase  +(i*4)) = 0xffffff00;
-		*(CursorBase+1+(i*4)) = 0xffff0000;
-		*(CursorBase+2+(i*4)) = 0xffff0000;
-		*(CursorBase+3+(i*4)) = 0xffff0000;
-	}
-	for (i=8; i < 64; i++){
-		*(CursorBase  +(i*4)) = 0xffff0000;
-		*(CursorBase+1+(i*4)) = 0xffff0000;
-		*(CursorBase+2+(i*4)) = 0xffff0000;
-		*(CursorBase+3+(i*4)) = 0xffff0000;
-	}
-#endif
-
-	retz3_setcolreg (255, 56<<8, 100<<8, 160<<8, 0, NULL /* unused */);
-	retz3_setcolreg (254, 0, 0, 0, 0, NULL /* unused */);
+	seq_w(regs, SEQ_MAP_MASK, 0x0f );
 
 	return 0;
 }
@@ -830,14 +756,17 @@
  *    values in the `par' structure.
  */
 
-static int retz3_encode_fix(struct fb_fix_screeninfo *fix,
+static int retz3_encode_fix(struct fb_info *info,
+			    struct fb_fix_screeninfo *fix,
 			    struct retz3fb_par *par)
 {
+	struct retz3_fb_info *zinfo = retz3info(info);
+
 	memset(fix, 0, sizeof(struct fb_fix_screeninfo));
 	strcpy(fix->id, retz3fb_name);
-	fix->smem_start = (char *)z3_fbmem;
-	fix->smem_len = z3_size;
-	fix->mmio_start = (char *)z3_regs;
+	fix->smem_start = (char *)(zinfo->physfbmem);
+	fix->smem_len = zinfo->fbsize;
+	fix->mmio_start = (char *)(zinfo->physregs);
 	fix->mmio_len = 0x00c00000;
 
 	fix->type = FB_TYPE_PACKED_PIXELS;
@@ -950,6 +879,9 @@
 			   unsigned int green, unsigned int blue,
 			   unsigned int transp, struct fb_info *info)
 {
+	struct retz3_fb_info *zinfo = retz3info(info);
+	volatile unsigned char *regs = zinfo->regs;
+
 	/* We'll get to this */
 
 	if (regno > 255)
@@ -959,14 +891,14 @@
 	green >>= 10;
 	blue >>= 10;
 
-	retz3_color_table [regno][0] = red;
-	retz3_color_table [regno][1] = green;
-	retz3_color_table [regno][2] = blue;
-
-	reg_w(VDAC_ADDRESS_W, regno);
-	reg_w(VDAC_DATA, red);
-	reg_w(VDAC_DATA, green);
-	reg_w(VDAC_DATA, blue);
+	zinfo->color_table[regno][0] = red;
+	zinfo->color_table[regno][1] = green;
+	zinfo->color_table[regno][2] = blue;
+
+	reg_w(regs, VDAC_ADDRESS_W, regno);
+	reg_w(regs, VDAC_DATA, red);
+	reg_w(regs, VDAC_DATA, green);
+	reg_w(regs, VDAC_DATA, blue);
 
 	return 0;
 }
@@ -981,55 +913,32 @@
 			   unsigned int *green, unsigned int *blue,
 			   unsigned int *transp, struct fb_info *info)
 {
+	struct retz3_fb_info *zinfo = retz3info(info);
 	int t;
 
 	if (regno > 255)
 		return 1;
-	t       = retz3_color_table [regno][0];
+	t       = zinfo->color_table[regno][0];
 	*red    = (t<<10) | (t<<4) | (t>>2);
-	t       = retz3_color_table [regno][1];
+	t       = zinfo->color_table[regno][1];
 	*green  = (t<<10) | (t<<4) | (t>>2);
-	t       = retz3_color_table [regno][2];
+	t       = zinfo->color_table[regno][2];
 	*blue   = (t<<10) | (t<<4) | (t>>2);
 	*transp = 0;
 	return 0;
 }
 
 
-/*
- *    (Un)Blank the screen
- */
-
-void retz3_blank(int blank)
-{
-	short i;
-
-	if (blank)
-		for (i = 0; i < 256; i++){
-			reg_w(VDAC_ADDRESS_W, i);
-			reg_w(VDAC_DATA, 0);
-			reg_w(VDAC_DATA, 0);
-			reg_w(VDAC_DATA, 0);
-		}
-	else
-		for (i = 0; i < 256; i++){
-			reg_w(VDAC_ADDRESS_W, i);
-			reg_w(VDAC_DATA, retz3_color_table [i][0]);
-			reg_w(VDAC_DATA, retz3_color_table [i][1]);
-			reg_w(VDAC_DATA, retz3_color_table [i][2]);
-		}
-}
-
-
-static void retz3_bitblt (struct fb_var_screeninfo *var,
+static void retz3_bitblt (struct display *p,
 			  unsigned short srcx, unsigned short srcy,
 			  unsigned short destx, unsigned short desty,
 			  unsigned short width, unsigned short height,
 			  unsigned short cmd, unsigned short mask)
 {
-
-	volatile unsigned long *acm = (unsigned long *) (z3_mem + ACM_OFFSET);
-	unsigned long *pattern = (unsigned long *)(z3_fbmem + PAT_MEM_OFF);
+	struct fb_var_screeninfo *var = &p->var;
+	struct retz3_fb_info *zinfo = retz3info(p->fb_info);
+	volatile unsigned long *acm = (unsigned long *)(zinfo->base + ACM_OFFSET);
+	unsigned long *pattern = (unsigned long *)(zinfo->fbmem + PAT_MEM_OFF);
 
 	unsigned short mod;
 	unsigned long tmp;
@@ -1132,55 +1041,50 @@
 }
 #endif
 
-/* -------------------- Interfaces to hardware functions -------------------- */
-
-
-static struct fb_hwswitch retz3_switch = {
-	retz3_init, retz3_encode_fix, retz3_decode_var, retz3_encode_var,
-	retz3_getcolreg, retz3_setcolreg, retz3_blank
-};
-
-
-/* -------------------- Generic routines ------------------------------------ */
-
 
 /*
  *    Fill the hardware's `par' structure.
  */
 
-static void retz3fb_get_par(struct retz3fb_par *par)
+static void retz3fb_get_par(struct fb_info *info, struct retz3fb_par *par)
 {
-	if (current_par_valid)
-		*par = current_par;
+	struct retz3_fb_info *zinfo = retz3info(info);
+
+	if (zinfo->current_par_valid)
+		*par = zinfo->current_par;
 	else
-		fbhw->decode_var(&retz3fb_default, par);
+		retz3_decode_var(&retz3fb_default, par);
 }
 
 
-static void retz3fb_set_par(struct retz3fb_par *par)
+static void retz3fb_set_par(struct fb_info *info, struct retz3fb_par *par)
 {
-	current_par = *par;
-	current_par_valid = 1;
+	struct retz3_fb_info *zinfo = retz3info(info);
+
+	zinfo->current_par = *par;
+	zinfo->current_par_valid = 1;
 }
 
 
-static int do_fb_set_var(struct fb_var_screeninfo *var, int isactive)
+static int do_fb_set_var(struct fb_info *info,
+			 struct fb_var_screeninfo *var, int isactive)
 {
 	int err, activate;
 	struct retz3fb_par par;
+	struct retz3_fb_info *zinfo = retz3info(info);
 
-	if ((err = fbhw->decode_var(var, &par)))
+	if ((err = retz3_decode_var(var, &par)))
 		return err;
 	activate = var->activate;
 
 	/* XXX ... what to do about isactive ? */
 
 	if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW && isactive)
-		retz3fb_set_par(&par);
-	fbhw->encode_var(var, &par);
+		retz3fb_set_par(info, &par);
+	retz3_encode_var(var, &par);
 	var->activate = activate;
 
-	retz3_set_video(var, &current_par);
+	retz3_set_video(info, var, &zinfo->current_par);
 
 	return 0;
 }
@@ -1188,13 +1092,15 @@
 
 static void do_install_cmap(int con, struct fb_info *info)
 {
-	if (con != currcon)
+	struct retz3_fb_info *zinfo = retz3info(info);
+
+	if (con != zinfo->currcon)
 		return;
 	if (fb_display[con].cmap.len)
-		fb_set_cmap(&fb_display[con].cmap, 1, fbhw->setcolreg, info);
+		fb_set_cmap(&fb_display[con].cmap, 1, retz3_setcolreg, info);
 	else
 		fb_set_cmap(fb_default_cmap(1<<fb_display[con].var.bits_per_pixel),
-					    1, fbhw->setcolreg, info);
+					    1, retz3_setcolreg, info);
 }
 
 
@@ -1230,10 +1136,10 @@
 	int error = 0;
 
 	if (con == -1)
-		retz3fb_get_par(&par);
+		retz3fb_get_par(info, &par);
 	else
-		error = fbhw->decode_var(&fb_display[con].var, &par);
-	return(error ? error : fbhw->encode_fix(fix, &par));
+		error = retz3_decode_var(&fb_display[con].var, &par);
+	return(error ? error : retz3_encode_fix(info, fix, &par));
 }
 
 
@@ -1248,8 +1154,8 @@
 	int error = 0;
 
 	if (con == -1) {
-		retz3fb_get_par(&par);
-		error = fbhw->encode_var(var, &par);
+		retz3fb_get_par(info, &par);
+		error = retz3_encode_var(var, &par);
 	} else
 		*var = fb_display[con].var;
 	return error;
@@ -1261,18 +1167,19 @@
 {
 	struct fb_fix_screeninfo fix;
 	struct display *display;
+	struct retz3_fb_info *zinfo = retz3info(info);
 
 	if (con >= 0)
 		display = &fb_display[con];
 	else
-		display = &disp;	/* used during initialization */
+		display = &zinfo->disp;	/* used during initialization */
 
 	retz3fb_get_fix(&fix, con, info);
 
 	if (con == -1)
 		con = 0;
 
-	display->screen_base = fix.smem_start;
+	display->screen_base = (char *)zinfo->fbmem;
 	display->visual = fix.visual;
 	display->type = fix.type;
 	display->type_aux = fix.type_aux;
@@ -1308,6 +1215,7 @@
 }
 #endif
 
+
 /*
  *    Set the User Defined Part of the Display
  */
@@ -1317,18 +1225,14 @@
 {
 	int err, oldxres, oldyres, oldvxres, oldvyres, oldbpp, oldaccel;
 	struct display *display;
+	struct retz3_fb_info *zinfo = retz3info(info);
 
 	if (con >= 0)
 		display = &fb_display[con];
 	else
-		display = &disp;	/* used during initialization */
-
-#if 0
-	if (con == -1)
-		con = 0;
-#endif
+		display = &zinfo->disp;	/* used during initialization */
 
-	if ((err = do_fb_set_var(var, con == currcon)))
+	if ((err = do_fb_set_var(info, var, con == zinfo->currcon)))
 		return err;
 	if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) {
 		oldxres = display->var.xres;
@@ -1348,7 +1252,7 @@
 			struct fb_fix_screeninfo fix;
 			retz3fb_get_fix(&fix, con, info);
 
-			display->screen_base = fix.smem_start;
+			display->screen_base = (char *)zinfo->fbmem;
 			display->visual = fix.visual;
 			display->type = fix.type;
 			display->type_aux = fix.type_aux;
@@ -1379,8 +1283,8 @@
 /*
 	retz3fb_set_disp(con, info);
 */
-			if (fb_info.changevar)
-				(*fb_info.changevar)(con);
+			if (info->changevar)
+				(*info->changevar)(con);
 		}
 
 		if (oldbpp != var->bits_per_pixel) {
@@ -1400,8 +1304,10 @@
 static int retz3fb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			    struct fb_info *info)
 {
-	if (con == currcon) /* current console? */
-		return(fb_get_cmap(cmap, kspc, fbhw->getcolreg, info));
+	struct retz3_fb_info *zinfo = retz3info(info);
+
+	if (con == zinfo->currcon) /* current console? */
+		return(fb_get_cmap(cmap, kspc, retz3_getcolreg, info));
 	else if (fb_display[con].cmap.len) /* non default colormap? */
 		fb_copy_cmap(&fb_display[con].cmap, cmap, kspc ? 0 : 2);
 	else
@@ -1419,6 +1325,7 @@
 			    struct fb_info *info)
 {
 	int err;
+	struct retz3_fb_info *zinfo = retz3info(info);
 
 	if (!fb_display[con].cmap.len) {       /* no colormap allocated? */
 		if ((err = fb_alloc_cmap(&fb_display[con].cmap,
@@ -1426,8 +1333,8 @@
 					 0)))
 			return err;
 	}
-	if (con == currcon)              /* current console? */
-		return(fb_set_cmap(cmap, kspc, fbhw->setcolreg, info));
+	if (con == zinfo->currcon)              /* current console? */
+		return(fb_set_cmap(cmap, kspc, retz3_setcolreg, info));
 	else
 		fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
 	return 0;
@@ -1470,8 +1377,6 @@
 {
 	char *this_opt;
 
-	fb_info.fontname[0] = '\0';
-
 	if (!options || !*options)
 		return;
 
@@ -1480,9 +1385,10 @@
 		if (!strcmp(this_opt, "inverse")) {
 			z3fb_inverse = 1;
 			fb_invert_cmaps();
-		} else if (!strncmp(this_opt, "font:", 5))
-			strcpy(fb_info.fontname, this_opt+5);
-		else
+		} else if (!strncmp(this_opt, "font:", 5)) {
+			strncpy(fontname, this_opt+5, 39);
+			fontname[39] = '\0';
+		}else
 			z3fb_mode = get_video_mode(this_opt);
 	}
 }
@@ -1497,59 +1403,79 @@
 	unsigned long board_addr, board_size;
 	unsigned int key;
 	const struct ConfigDev *cd;
-
+	volatile unsigned char *regs;
 	struct retz3fb_par par;
+	struct retz3_fb_info *zinfo;
+	struct fb_info *fb_info;
+	short i;
 
 	if (!(key = zorro_find(ZORRO_PROD_MACROSYSTEMS_RETINA_Z3, 0, 0)))
 		return;
 
+	if (!(zinfo = kmalloc(sizeof(struct retz3_fb_info), GFP_KERNEL)))
+		return;
+	memset(zinfo, 0, sizeof(struct retz3_fb_info));
+
 	cd = zorro_get_board (key);
 	zorro_config_board (key, 0);
 	board_addr = (unsigned long)cd->cd_BoardAddr;
 	board_size = (unsigned long)cd->cd_BoardSize;
 
-	z3_mem = kernel_map (board_addr, board_size,
-			     KERNELMAP_NOCACHE_SER, NULL);
-
-	z3_regs = (char*) z3_mem;
-	z3_fbmem = z3_mem + VIDEO_MEM_OFFSET;
-
+	zinfo->base = kernel_map (board_addr, board_size,
+				   KERNELMAP_NOCACHE_SER, NULL);
+	zinfo->regs = (unsigned char *)(zinfo->base);
+	zinfo->fbmem = zinfo->base + VIDEO_MEM_OFFSET;
 	/* Get memory size - for now we asume its a 4MB board */
+	zinfo->fbsize = 0x00400000; /* 4 MB */
+	zinfo->physregs = board_addr;
+	zinfo->physfbmem = board_addr + VIDEO_MEM_OFFSET;
 
-	z3_size = 0x00400000; /* 4 MB */
+	fb_info = fbinfo(zinfo);
 
-	fbhw = &retz3_switch;
+	for (i = 0; i < 256; i++){
+		for (i = 0; i < 256; i++){
+			zinfo->color_table[i][0] = i;
+			zinfo->color_table[i][1] = i;
+			zinfo->color_table[i][2] = i;
+		}
+	}
+
+	regs = zinfo->regs;
+	/* Disable hardware cursor */
+	seq_w(regs, SEQ_CURSOR_Y_INDEX, 0x00);
 
-	fbhw->init();
+	retz3_setcolreg (255, 56<<8, 100<<8, 160<<8, 0, fb_info);
+	retz3_setcolreg (254, 0, 0, 0, 0, fb_info);
 
-	strcpy(fb_info.modename, retz3fb_name);
-	fb_info.changevar = NULL;
-	fb_info.node = -1;
-	fb_info.fbops = &retz3fb_ops;
-	fb_info.disp = &disp;
-	fb_info.switch_con = &z3fb_switch;
-	fb_info.updatevar = &z3fb_updatevar;
-	fb_info.blank = &z3fb_blank;
-	fb_info.flags = FBINFO_FLAG_DEFAULT;
+	strcpy(fb_info->modename, retz3fb_name);
+	fb_info->changevar = NULL;
+	fb_info->node = -1;
+	fb_info->fbops = &retz3fb_ops;
+	fb_info->disp = &zinfo->disp;
+	fb_info->switch_con = &z3fb_switch;
+	fb_info->updatevar = &z3fb_updatevar;
+	fb_info->blank = &z3fb_blank;
+	fb_info->flags = FBINFO_FLAG_DEFAULT;
+	strncpy(fb_info->fontname, fontname, 40);
 
 	if (z3fb_mode == -1)
 		retz3fb_default = retz3fb_predefined[0].var;
 
-	fbhw->decode_var(&retz3fb_default, &par);
-	fbhw->encode_var(&retz3fb_default, &par);
+	retz3_decode_var(&retz3fb_default, &par);
+	retz3_encode_var(&retz3fb_default, &par);
 
-	do_fb_set_var(&retz3fb_default, 0);
-	retz3fb_get_var(&disp.var, -1, &fb_info);
+	do_fb_set_var(fb_info, &retz3fb_default, 0);
+	retz3fb_get_var(&zinfo->disp.var, -1, fb_info);
 
-	retz3fb_set_disp(-1, &fb_info);
+	retz3fb_set_disp(-1, fb_info);
 
-	do_install_cmap(0, &fb_info);
+	do_install_cmap(0, fb_info);
 
-	if (register_framebuffer(&fb_info) < 0)
+	if (register_framebuffer(fb_info) < 0)
 		return;
 
 	printk("fb%d: %s frame buffer device, using %ldK of video memory\n",
-	       GET_FB_IDX(fb_info.node), fb_info.modename, z3_size>>10);
+	       GET_FB_IDX(fb_info->node), fb_info->modename,zinfo->fbsize>>10);
 
 	/* TODO: This driver cannot be unloaded yet */
 	MOD_INC_USE_COUNT;
@@ -1558,13 +1484,15 @@
 
 static int z3fb_switch(int con, struct fb_info *info)
 {
+	struct retz3_fb_info *zinfo = retz3info(info);
+
 	/* Do we have to save the colormap? */
-	if (fb_display[currcon].cmap.len)
-		fb_get_cmap(&fb_display[currcon].cmap, 1, fbhw->getcolreg,
-			    info);
+	if (fb_display[zinfo->currcon].cmap.len)
+		fb_get_cmap(&fb_display[zinfo->currcon].cmap, 1,
+			    retz3_getcolreg, info);
 
-	do_fb_set_var(&fb_display[con].var, 1);
-	currcon = con;
+	do_fb_set_var(info, &fb_display[con].var, 1);
+	zinfo->currcon = con;
 	/* Install new colormap */
 	do_install_cmap(con, info);
 	return 0;
@@ -1590,7 +1518,24 @@
 
 static void z3fb_blank(int blank, struct fb_info *info)
 {
-	fbhw->blank(blank);
+	struct retz3_fb_info *zinfo = retz3info(info);
+	volatile unsigned char *regs = retz3info(info)->regs;
+	short i;
+
+	if (blank)
+		for (i = 0; i < 256; i++){
+			reg_w(regs, VDAC_ADDRESS_W, i);
+			reg_w(regs, VDAC_DATA, 0);
+			reg_w(regs, VDAC_DATA, 0);
+			reg_w(regs, VDAC_DATA, 0);
+		}
+	else
+		for (i = 0; i < 256; i++){
+			reg_w(regs, VDAC_ADDRESS_W, i);
+			reg_w(regs, VDAC_DATA, zinfo->color_table[i][0]);
+			reg_w(regs, VDAC_DATA, zinfo->color_table[i][1]);
+			reg_w(regs, VDAC_DATA, zinfo->color_table[i][2]);
+		}
 }
 
 
@@ -1635,8 +1580,8 @@
  */
 
 #ifdef FBCON_HAS_CFB8
-static void fbcon_retz3_8_bmove(struct display *p, int sy, int sx, int dy, int dx,
-	                int height, int width)
+static void fbcon_retz3_8_bmove(struct display *p, int sy, int sx,
+				int dy, int dx, int height, int width)
 {
 	int fontwidth = fontwidth(p);
 
@@ -1644,7 +1589,7 @@
 	dx *= fontwidth;
 	width *= fontwidth;
 
-	retz3_bitblt(&p->var,
+	retz3_bitblt(p,
 		     (unsigned short)sx,
 		     (unsigned short)(sy*fontheight(p)),
 		     (unsigned short)dx,
@@ -1655,8 +1600,8 @@
 		     0xffff);
 }
 
-static void fbcon_retz3_8_clear(struct vc_data *conp, struct display *p, int
-			sy, int sx, int height, int width)
+static void fbcon_retz3_8_clear(struct vc_data *conp, struct display *p,
+				int sy, int sx, int height, int width)
 {
 	unsigned short col;
 	int fontwidth = fontwidth(p);
@@ -1668,7 +1613,7 @@
 	col &= 0xff;
 	col |= (col << 8);
 
-	retz3_bitblt(&p->var,
+	retz3_bitblt(p,
 		     (unsigned short)sx,
 		     (unsigned short)(sy*fontheight(p)),
 		     (unsigned short)sx,