kernel-source-2.2.19 diff: CV64

[Alan <alanrb@bigfoot.com>]

Hi,

The included diff drops the configuration choice of a module for the
CV64 driver, since it will not work as a module. It also makes use of
the gfx hardware to blank the display instead of just changing the
colormap. I have tested this by cross-compiling on my PC and running the
kernel-image on my A3000. The diffs are vs. the Debian source and m68k
patch packages. Hopefully I have generated the diff in the correct way,
if not, please tell me what I did wrong so I can do it right the next
time.

Alan

diff -ur kernel-source-2.2.19/drivers/video/Config.in
kernel-source-2.2.19-ARB/drivers/video/Config.in
--- kernel-source-2.2.19/drivers/video/Config.in	Fri May  4 22:18:11
2001
+++ kernel-source-2.2.19-ARB/drivers/video/Config.in	Fri May  4 21:01:36
2001
@@ -39,7 +39,8 @@
     fi
   fi
   if [ "$CONFIG_ZORRO" = "y" ]; then
-    tristate 'Amiga CyberVision support' CONFIG_FB_CYBER
+#    tristate 'Amiga CyberVision support' CONFIG_FB_CYBER
+    bool 'Amiga CyberVision support' CONFIG_FB_CYBER
     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       bool 'Amiga CyberVision3D support (experimental)' CONFIG_FB_VIRGE
       tristate 'Amiga RetinaZ3 support' CONFIG_FB_RETINAZ3
diff -ur kernel-source-2.2.19/drivers/video/cyberfb.c
kernel-source-2.2.19-ARB/drivers/video/cyberfb.c
--- kernel-source-2.2.19/drivers/video/cyberfb.c	Fri Nov 17 18:22:15
2000
+++ kernel-source-2.2.19-ARB/drivers/video/cyberfb.c	Sun Apr 22 00:53:03
2001
@@ -592,11 +592,12 @@
 	int i;
 
 	DPRINTK("ENTER\n");
-#if 0
-/* Blank by turning gfx off */
-	gfx_on_off (1, regs);
-#else
 	if (blank) {
+#if 1
+		/* Blank by turning off gfx */
+		gfx_on_off (1, regs);
+#else
+		/* Blank by setting colormap to black */
 		for (i = 0; i < 256; i++) {
 			wb_64(regs, 0x3c8, (unsigned char) i);
 			/* ARB Pale red to detect this blanking method */
@@ -604,15 +605,21 @@
 			wb_64(regs, 0x3c9, 0);
 			wb_64(regs, 0x3c9, 0);
 		}
+#endif
 	} else {
+#if 1
+		/* unBlank by turning on gfx */
+		gfx_on_off (0, regs);
+#else
+		/* unBlank by restoring colormap values */
 		for (i = 0; i < 256; i++) {
 			wb_64(regs, 0x3c8, (unsigned char) i);
 			wb_64(regs, 0x3c9, Cyber_colour_table[i][0]);
 			wb_64(regs, 0x3c9, Cyber_colour_table[i][1]);
 			wb_64(regs, 0x3c9, Cyber_colour_table[i][2]);
 		}
-	}
 #endif
+	}
 	DPRINTK("EXIT\n");
 }