patch-2.3.99-pre1 linux/drivers/video/cyber2000fb.c

• Lines: 161
• Date: Sun Mar 12 19:39:39 2000
• Orig file: v2.3.51/linux/drivers/video/cyber2000fb.c
• Orig date: Thu Mar 2 14:36:23 2000

diff -u --recursive --new-file v2.3.51/linux/drivers/video/cyber2000fb.c linux/drivers/video/cyber2000fb.c
@@ -32,6 +32,7 @@
 #include <video/fbcon-cfb24.h>
 
 #define MMIO_SIZE	0x000c0000
+/*#define CFB16_IS_CFB15*/
 
 static char			*CyberRegs;
 
@@ -275,18 +276,8 @@
 #endif
 
 #ifdef FBCON_HAS_CFB16
-	case 15:
-		if (regno < 32) {
-			cyber2000_outb(regno << 3, 0x3c8);
-			cyber2000_outb(red, 0x3c9);
-			cyber2000_outb(green, 0x3c9);
-			cyber2000_outb(blue, 0x3c9);
-		}
-		if (regno < 16)
-			current_par.c_table.cfb16[regno] = regno | regno << 5 | regno << 10;
-		break;
-
 	case 16:
+#ifndef CFB16_IS_CFB15
 		if (regno < 64) {
 			/* write green */
 			cyber2000_outb(regno << 2, 0x3c8);
@@ -308,6 +299,19 @@
 		break;
 #endif
 
+	case 15:
+		if (regno < 32) {
+			cyber2000_outb(regno << 3, 0x3c8);
+			cyber2000_outb(red, 0x3c9);
+			cyber2000_outb(green, 0x3c9);
+			cyber2000_outb(blue, 0x3c9);
+		}
+		if (regno < 16)
+			current_par.c_table.cfb16[regno] = regno | regno << 5 | regno << 10;
+		break;
+
+#endif
+
 #ifdef FBCON_HAS_CFB24
 	case 24:
 		cyber2000_outb(regno, 0x3c8);
@@ -345,6 +349,7 @@
 	 * Other
 	 */
 	unsigned int	visual;
+	unsigned char	palette_ctrl;
 };
 
 static const char crtc_idx[] = {
@@ -418,7 +423,7 @@
 	cyber2000_outb(0x56, 0x3ce);
 	i = cyber2000_inb(0x3cf);
 	cyber2000_outb(i | 4, 0x3cf);
-	cyber2000_outb(0x04, 0x3c6);
+	cyber2000_outb(hw->palette_ctrl, 0x3c6);
 	cyber2000_outb(i,    0x3cf);
 
 	cyber2000_outb(0x20, 0x3c0);
@@ -776,37 +781,76 @@
 	int err;
 
 	hw->width = var->xres_virtual;
+
+	var->red.msb_right	= 0;
+	var->green.msb_right	= 0;
+	var->blue.msb_right	= 0;
+
 	switch (var->bits_per_pixel) {
 #ifdef FBCON_HAS_CFB8
 	case 8:	/* PSEUDOCOLOUR, 256 */
-		hw->visual    = FB_VISUAL_PSEUDOCOLOR;
-		hw->pixformat = PIXFORMAT_8BPP;
-		hw->visualid  = VISUALID_256;
-		hw->pitch     = hw->width >> 3;
+		var->bits_per_pixel	= 8;
+		var->red.offset		= 0;
+		var->red.length		= 8;
+		var->green.offset	= 0;
+		var->green.length	= 8;
+		var->blue.offset	= 0;
+		var->blue.length	= 8;
+		hw->visual		= FB_VISUAL_PSEUDOCOLOR;
+		hw->pixformat		= PIXFORMAT_8BPP;
+		hw->visualid		= VISUALID_256;
+		hw->pitch		= hw->width >> 3;
+		hw->palette_ctrl	= 0x04;
 		break;
 #endif
 #ifdef FBCON_HAS_CFB16
+	case 16:/* DIRECTCOLOUR, 64k */
+#ifndef CFB16_IS_CFB15
+		var->bits_per_pixel	= 16;
+		var->red.offset		= 11;
+		var->red.length		= 5;
+		var->green.offset	= 5;
+		var->green.length	= 6;
+		var->blue.offset	= 0;
+		var->blue.length	= 5;
+		hw->visual		= FB_VISUAL_DIRECTCOLOR;
+		hw->pixformat		= PIXFORMAT_16BPP;
+		hw->visualid		= VISUALID_64K;
+		hw->pitch		= hw->width >> 2;
+		hw->palette_ctrl	= 0x14;
+		break;
+#endif
 	case 15:/* DIRECTCOLOUR, 32k */
-		hw->visual    = FB_VISUAL_DIRECTCOLOR;
-		hw->pixformat = PIXFORMAT_16BPP;
-		hw->visualid  = VISUALID_32K;
-		hw->pitch     = hw->width >> 2;
+		var->bits_per_pixel	= 15;
+		var->red.offset		= 10;
+		var->red.length		= 5;
+		var->green.offset	= 5;
+		var->green.length	= 5;
+		var->blue.offset	= 0;
+		var->blue.length	= 5;
+		hw->visual		= FB_VISUAL_DIRECTCOLOR;
+		hw->pixformat		= PIXFORMAT_16BPP;
+		hw->visualid		= VISUALID_32K;
+		hw->pitch		= hw->width >> 2;
+		hw->palette_ctrl	= 0x14;
 		break;
 
-	case 16:/* DIRECTCOLOUR, 64k */
-		hw->visual    = FB_VISUAL_DIRECTCOLOR;
-		hw->pixformat = PIXFORMAT_16BPP;
-		hw->visualid  = VISUALID_64K;
-		hw->pitch     = hw->width >> 2;
-		break;
 #endif
 #ifdef FBCON_HAS_CFB24
 	case 24:/* TRUECOLOUR, 16m */
-		hw->visual    = FB_VISUAL_TRUECOLOR;
-		hw->pixformat = PIXFORMAT_24BPP;
-		hw->visualid  = VISUALID_16M;
-		hw->width    *= 3;
-		hw->pitch     = hw->width >> 3;
+		var->bits_per_pixel	= 24;
+		var->red.offset		= 16;
+		var->red.length		= 8;
+		var->green.offset	= 8;
+		var->green.length	= 8;
+		var->blue.offset	= 0;
+		var->blue.length	= 8;
+		hw->visual		= FB_VISUAL_TRUECOLOR;
+		hw->pixformat		= PIXFORMAT_24BPP;
+		hw->visualid		= VISUALID_16M;
+		hw->width		*= 3;
+		hw->pitch		= hw->width >> 3;
+		hw->palette_ctrl	= 0x14;
 		break;
 #endif
 	default: