patch-2.4.0-test3 linux/drivers/video/riva/fbdev.c

• Lines: 299
• Date: Wed Jul 5 10:56:12 2000
• Orig file: v2.4.0-test2/linux/drivers/video/riva/fbdev.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/video/riva/fbdev.c linux/drivers/video/riva/fbdev.c
@@ -1,7 +1,9 @@
 /*
  * linux/drivers/video/rivafb.c - nVidia RIVA 128/TNT/TNT2 fb driver
  *
- * Copyright 1999 Jeff Garzik <jgarzik@mandrakesoft.com>
+ * Maintained by Ani Joshi <ajoshi@shell.unixbox.com>
+ *
+ * Copyright 1999-2000 Jeff Garzik
  *
  * Contributors:
  *
@@ -20,7 +22,7 @@
  */
 
 /* version number of this driver */
-#define RIVAFB_VERSION "0.7.1"
+#define RIVAFB_VERSION "0.7.2"
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -208,10 +210,10 @@
 static struct rivafb_info *riva_boards = NULL;
 
 /* command line data, set in rivafb_setup() */
-static char fontname[40] __initdata;
+static char fontname[40] __initdata = { 0 };
 #ifndef MODULE
-static char noaccel __initdata;	/* unused */
-static const char *mode_option __initdata;
+static char noaccel __initdata = 0;	/* unused */
+static const char *mode_option __initdata = NULL;
 #endif
 
 static struct fb_var_screeninfo rivafb_default_var = {
@@ -253,14 +255,14 @@
 			   struct fb_info *info);
 static int riva_get_cmap_len (const struct fb_var_screeninfo *var);
 
-static int riva_pci_register (struct pci_dev *pd,
-			      const struct riva_chip_info *rci);
 static int riva_set_fbinfo (struct rivafb_info *rinfo);
 
 static void riva_save_state (struct rivafb_info *rinfo, struct riva_regs *regs);
 static void riva_load_state (struct rivafb_info *rinfo, struct riva_regs *regs);
 static struct rivafb_info *riva_board_list_add (struct rivafb_info *board_list,
 					 struct rivafb_info *new_node);
+static struct rivafb_info *riva_board_list_del (struct rivafb_info *board_list,
+					 struct rivafb_info *del_node);
 static void riva_wclut (unsigned char regnum, unsigned char red,
 			unsigned char green, unsigned char blue);
 
@@ -286,7 +288,7 @@
 static const struct riva_regs reg_template = {
 	{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,	/* ATTR */
 	 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-	 0x41, 0x01, 0x0F, 0x13, 0x00},
+	 0x41, 0x01, 0x0F, 0x00, 0x00},
 	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,	/* CRT  */
 	 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00,
 	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE3,	/* 0x10 */
@@ -378,9 +380,6 @@
 	if (mode_option)
 		fb_find_mode (&rinfo->disp.var, &rinfo->info, mode_option,
 			      NULL, 0, NULL, 8);
-	else
-		fb_find_mode (&rinfo->disp.var, &rinfo->info,
-			      "640x480-8@60", NULL, 0, NULL, 8);
 #endif				/* !MODULE */
 	return 0;
 }
@@ -403,7 +402,7 @@
 	disp->var = rivafb_default_var;
 	info->disp = disp;
 
-#warning FIXME: assure that disp->cmap is completely filled out
+	/* FIXME: assure that disp->cmap is completely filled out */
 
 	disp->screen_base = rinfo->fb_base;
 	disp->visual = FB_VISUAL_PSEUDOCOLOR;
@@ -447,13 +446,13 @@
 	info->flags = FBINFO_FLAG_DEFAULT;
 	info->fbops = &riva_fb_ops;
 
-#warning FIXME: set monspecs to what???
+	/* FIXME: set monspecs to what??? */
 
-	info->display_fg = NULL;	/* FIXME: correct? */
+	info->display_fg = NULL;
 	strncpy (info->fontname, fontname, sizeof (info->fontname));
 	info->fontname[sizeof (info->fontname) - 1] = 0;
 
-	info->changevar = NULL;	/* FIXME: needed? */
+	info->changevar = NULL;
 	info->switch_con = rivafb_switch;
 	info->updatevar = rivafb_updatevar;
 	info->blank = rivafb_blank;
@@ -472,32 +471,6 @@
 
 
 
-static void __devinit riva_init_clut (struct rivafb_info *fb_info)
-{
-	int j, k, red, green, blue;
-
-	for (j = 0; j < 256; j++) {
-		if (j < 16) {
-			/* use default fbcon colors for first 16 */
-			k = color_table[j];
-			red = default_red[k];
-			green = default_grn[k];
-			blue = default_blu[k];
-		} else {
-			/* grey ramp for rest of colors */
-			red = green = blue = j;
-		}
-
-		riva_wclut (j, red, green, blue);
-
-		fb_info->palette[j].red = red;
-		fb_info->palette[j].green = green;
-		fb_info->palette[j].blue = blue;
-	}
-}
-
-
-
 static int __devinit rivafb_init_one (struct pci_dev *pd,
 				      const struct pci_device_id *ent)
 {
@@ -597,7 +570,7 @@
 
 	riva_set_fbinfo (rinfo);
 
-	riva_init_clut (rinfo);
+	fb_memset (rinfo->fb_base, 0, rinfo->ram_amount);
 
 	riva_load_video_mode (rinfo, &rinfo->disp.var);
 
@@ -607,6 +580,8 @@
 		goto err_out_iounmap_fb;
 	}
 
+	riva_boards = riva_board_list_add(riva_boards, rinfo);
+
 	pd->driver_data = rinfo;
 
 	printk ("PCI Riva NV%d framebuffer ver %s (%s, %dMB @ 0x%lX)\n",
@@ -640,6 +615,8 @@
 	if (!board)
 		return;
 		
+	riva_boards = riva_board_list_del(riva_boards, board);
+
 	riva_load_state (board, &board->initial_state);
 
 	unregister_framebuffer ((struct fb_info *) board);
@@ -750,7 +727,7 @@
 
 	fix->line_length = p->line_length;
 
-#warning FIXME: set up MMIO region, export via FB_ACCEL_xxx
+	/* FIXME: set up MMIO region, export via FB_ACCEL_xxx */
 	fix->mmio_start = 0;
 	fix->mmio_len = 0;
 	fix->accel = FB_ACCEL_NONE;
@@ -983,7 +960,7 @@
 
 	dsp->type = FB_TYPE_PACKED_PIXELS;
 
-#warning FIXME: verify that the above code sets dsp->* fields correctly
+	/* FIXME: verify that the above code sets dsp->* fields correctly */
 
 	memcpy (&dsp->var, &v, sizeof (v));
 
@@ -1355,6 +1332,7 @@
 {
 	struct rivafb_info *rivainfo = (struct rivafb_info *) info;
 	struct display *p;
+	unsigned shift = 8;
 
 	DPRINTK ("ENTER\n");
 
@@ -1370,11 +1348,22 @@
 		red = green = blue =
 		    (red * 77 + green * 151 + blue * 28) >> 8;
 	}
+
+	switch (rivainfo->riva.Architecture) {
+	case 3:
+		shift = 10;
+		break;
+	case 4:
+	case 5:
+		shift = 8;
+		break;
+	}
+
 #ifdef FBCON_HAS_CFB8
 	switch (p->var.bits_per_pixel) {
 	case 8:
 		/* "transparent" stuff is completely ignored. */
-		riva_wclut (regno, red >> 10, green >> 10, blue >> 10);
+		riva_wclut (regno, red >> shift, green >> shift, blue >> shift);
 		break;
 	default:
 		/* do nothing */
@@ -1469,24 +1458,24 @@
 	newmode.crtc[0x0] = Set8Bits (hTotal - 4);
 	newmode.crtc[0x1] = Set8Bits (hDisplay);
 	newmode.crtc[0x2] = Set8Bits (hDisplay);
-      newmode.crtc[0x3] = SetBitField (hTotal, 4: 0, 4:0) | SetBit (7);
+	newmode.crtc[0x3] = SetBitField (hTotal, 4: 0, 4:0) | SetBit (7);
 	newmode.crtc[0x4] = Set8Bits (hStart);
-      newmode.crtc[0x5] = SetBitField (hTotal, 5: 5, 7:7)
-      | SetBitField (hEnd, 4: 0, 4:0);
-      newmode.crtc[0x6] = SetBitField (vTotal, 7: 0, 7:0);
-      newmode.crtc[0x7] = SetBitField (vTotal, 8: 8, 0:0)
-      | SetBitField (vDisplay, 8: 8, 1:1)
-      | SetBitField (vStart, 8: 8, 2:2)
-      | SetBitField (vDisplay, 8: 8, 3:3)
-	    | SetBit (4)
-      | SetBitField (vTotal, 9: 9, 5:5)
-      | SetBitField (vDisplay, 9: 9, 6:6)
-      | SetBitField (vStart, 9: 9, 7:7);
-      newmode.crtc[0x9] = SetBitField (vDisplay, 9: 9, 5:5)
-	    | SetBit (6);
+	newmode.crtc[0x5] = SetBitField (hTotal, 5: 5, 7:7)
+		| SetBitField (hEnd, 4: 0, 4:0);
+	newmode.crtc[0x6] = SetBitField (vTotal, 7: 0, 7:0);
+	newmode.crtc[0x7] = SetBitField (vTotal, 8: 8, 0:0)
+		| SetBitField (vDisplay, 8: 8, 1:1)
+		| SetBitField (vStart, 8: 8, 2:2)
+		| SetBitField (vDisplay, 8: 8, 3:3)
+		| SetBit (4)
+		| SetBitField (vTotal, 9: 9, 5:5)
+		| SetBitField (vDisplay, 9: 9, 6:6)
+		| SetBitField (vStart, 9: 9, 7:7);
+	newmode.crtc[0x9] = SetBitField (vDisplay, 9: 9, 5:5)
+		| SetBit (6);
 	newmode.crtc[0x10] = Set8Bits (vStart);
-      newmode.crtc[0x11] = SetBitField (vEnd, 3: 0, 3:0)
-	    | SetBit (5);
+	newmode.crtc[0x11] = SetBitField (vEnd, 3: 0, 3:0)
+		| SetBit (5);
 	newmode.crtc[0x12] = Set8Bits (vDisplay);
 	newmode.crtc[0x13] = ((width / 8) * (bpp / 8)) & 0xFF;
 	newmode.crtc[0x15] = Set8Bits (vDisplay);
@@ -1538,7 +1527,7 @@
 #endif				/* MODULE */
 module_exit(rivafb_exit);
 
-MODULE_AUTHOR("Jeff Garzik <jgarzik@mandrakesoft.com>");
+MODULE_AUTHOR("Ani Joshi, maintainer");
 MODULE_DESCRIPTION("Framebuffer driver for nVidia Riva 128, TNT, TNT2");
 
 
@@ -1644,7 +1633,7 @@
 
 	for (i = 0; i < NUM_ATC_REGS; i++) {
 		io_out8 (i, 0x3C0);
-		io_out8 (regs->attr[i], 0x3C1);
+		io_out8 (regs->attr[i], 0x3C0);
 	}
 
 	for (i = 0; i < NUM_GRC_REGS; i++) {
@@ -1689,3 +1678,33 @@
 
 	return board_list;
 }
+
+
+
+/**
+ * riva_board_list_del
+ * @board_list: Root node of list of boards
+ * @del_node: Node to be removed
+ *
+ * DESCRIPTION:
+ * Removes @del_node from the list referenced by @board_list
+ *
+ * RETURNS:
+ * New root node
+ */
+static
+struct rivafb_info *riva_board_list_del (struct rivafb_info *board_list,
+					 struct rivafb_info *del_node)
+{
+	struct rivafb_info *i_p = board_list;
+
+	if (board_list == del_node)
+		return del_node->next;
+
+	while (i_p->next != del_node)
+		i_p = i_p->next;
+	i_p->next = del_node->next;
+
+	return board_list;
+}
+