[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Potato Installation Report



On Fri, Jul 14, 2000 at 09:28:20 +0200, Christian T. Steigies wrote:

> Last weekend I demonstrated a debian install on an A4k with PIV board. It
> worked very nicely, but I found the debug messages very annoying, ie when
> you switch the console, you get some debug output all over your screen.
> Interesting but quite ugly. If I had such a board at home, I would have
> complained long ago...

As a matter of fact I've fixed it long ago (together with a little bug,
which occasionally trashes the console), but completely forgot to submit
the patch. :) Anyway here it is (for 2.2.16, but it should work with 2.2.10
or 2.2.14 as well).

Btw. is anyone interested in an unofficial 2.2.16 native diff for m68k (and
could suggest an ftp site where I could upload it)?

-Michael


diff -urN linux-2.2.16-i386/drivers/video/clgenfb.c linux-2.2.16-m68k/drivers/video/clgenfb.c
--- linux-2.2.16-i386/drivers/video/clgenfb.c	Thu Feb 25 19:02:11 1999
+++ linux-2.2.16-m68k/drivers/video/clgenfb.c	Sun Jun 11 12:48:08 2000
@@ -312,9 +312,9 @@
                   unsigned int cmd, unsigned long arg, int con,
                   struct fb_info *info)
 {
-    printk(">clgenfb_ioctl()\n");
+    DEBUG printk(">clgenfb_ioctl()\n");
     /* Nothing exciting here... */
-    printk("<clgenfb_ioctl()\n");
+    DEBUG printk("<clgenfb_ioctl()\n");
     return -EINVAL;
 }
 
@@ -324,8 +324,8 @@
 
 static void clgen_detect(void)
 {
-    printk(">clgen_detect()\n");
-    printk("<clgen_detect()\n");
+    DEBUG printk(">clgen_detect()\n");
+    DEBUG printk("<clgen_detect()\n");
 }
 
 static int clgen_encode_fix(struct fb_fix_screeninfo *fix, const void *par,
@@ -375,12 +375,12 @@
     struct clgenfb_par *_par = (struct clgenfb_par *)par;
 
     fb_info = (struct clgenfb_info*)info;
-    printk("clgen_decode_var()\n");
+    DEBUG printk("clgen_decode_var()\n");
 
-    printk("Requested: %dx%dx%d\n", var->xres,var->yres,var->bits_per_pixel);
-    printk("  virtual: %dx%d\n", var->xres_virtual,var->yres_virtual);
-    printk("   offset: (%d,%d)\n", var->xoffset, var->yoffset);
-    printk("grayscale: %d\n", var->grayscale);
+    DEBUG printk("Requested: %dx%dx%d\n", var->xres,var->yres,var->bits_per_pixel);
+    DEBUG printk("  virtual: %dx%d\n", var->xres_virtual,var->yres_virtual);
+    DEBUG printk("   offset: (%d,%d)\n", var->xoffset, var->yoffset);
+    DEBUG printk("grayscale: %d\n", var->grayscale);
 #if 0
     printk(" activate: 0x%x\n", var->activate);
     printk(" pixclock: %d\n", var->pixclock);
@@ -601,10 +601,10 @@
     int offset = 0;
     struct clgenfb_par *_par = (struct clgenfb_par*)par;
 
-    printk(KERN_INFO">clgen_set_par()\n");
-    printk(KERN_INFO"Requested mode: %dx%dx%d\n",
+    DEBUG printk(KERN_INFO">clgen_set_par()\n");
+    DEBUG printk(KERN_INFO"Requested mode: %dx%dx%d\n",
 		    _par->var.xres, _par->var.yres, _par->var.bits_per_pixel);
-    printk(KERN_INFO"pixclock: %d\n", _par->var.pixclock);
+    DEBUG printk(KERN_INFO"pixclock: %d\n", _par->var.pixclock);
     
     fb_info = (struct clgenfb_info *)info;
 
@@ -975,7 +975,7 @@
 
     fb_info->currentmode = *_par;
 
-    printk("virtual offset: (%d,%d)\n", _par->var.xoffset,_par->var.yoffset);
+    DEBUG printk("virtual offset: (%d,%d)\n", _par->var.xoffset,_par->var.yoffset);
     /* pan to requested offset */
     clgen_pan_display (&fb_info->currentmode.var, (struct fb_info_gen*)fb_info);
 
@@ -1087,7 +1087,7 @@
 static int clgen_blank(int blank_mode, struct fb_info_gen *info)
 {
     unsigned char val;
-    printk(">clgen_blank(%d)\n",blank_mode);
+    DEBUG printk(">clgen_blank(%d)\n",blank_mode);
 
     fb_info = (struct clgenfb_info *)info;
 
@@ -1097,7 +1097,7 @@
     else
 	WSeq(SEQR1, val & 0xdf); /* clear "FullBandwidth" bit */
 
-    printk("<clgen_blank()\n");
+    DEBUG printk("<clgen_blank()\n");
     return 0;
 }
 
@@ -1107,7 +1107,7 @@
 
 static void init_vgachip(void)
 {
-    printk(">init_vgachip()\n");
+    DEBUG printk(">init_vgachip()\n");
 
     /* reset board globally */
     switch(fb_info->btype)
@@ -1341,7 +1341,7 @@
     }
 #endif
     printk(KERN_INFO "clgen: This board has %ld bytes of DRAM memory\n", fb_info->size);
-    printk("<init_vgachip()\n");
+    DEBUG printk("<init_vgachip()\n");
     return;
 }
 
@@ -1378,39 +1378,39 @@
     struct clgenfb_par *_par = (struct clgenfb_par*) par;
     struct clgenfb_info *info2 = (struct clgenfb_info *)info;
 
-    printk("clgen_set_disp(): ");
+    DEBUG printk("clgen_set_disp(): ");
     disp->screen_base = info2->fbmem;
     switch (_par->var.bits_per_pixel)
     {
 #ifdef FBCON_HAS_MFB
     case 1:
-	printk("monochrome\n");
+	DEBUG printk("monochrome\n");
 	disp->dispsw = &fbcon_mfb;
 	break;
 #endif
 #ifdef FBCON_HAS_CFB8
     case 8:
-	printk("8 bit color depth\n");
+	DEBUG printk("8 bit color depth\n");
 	disp->dispsw = &fbcon_clgen_8;
 	break;
 #endif
 #ifdef FBCON_HAS_CFB16
     case 16:
-	printk("16 bit color depth\n");
+	DEBUG printk("16 bit color depth\n");
 	disp->dispsw = &fbcon_cfb16;
 	disp->dispsw_data = info2->fbcon_cmap.cfb16;
 	break;
 #endif
 #ifdef FBCON_HAS_CFB24
     case 24:
-	printk("24 bit color depth\n");
+	DEBUG printk("24 bit color depth\n");
 	disp->dispsw = &fbcon_cfb24;
 	disp->dispsw_data = info2->fbcon_cmap.cfb24;
 	break;
 #endif
 #ifdef FBCON_HAS_CFB32
     case 32:
-	printk("32 bit color depth\n");
+	DEBUG printk("32 bit color depth\n");
 	disp->dispsw = &fbcon_cfb32;
 	disp->dispsw_data = info2->fbcon_cmap.cfb32;
 	break;
@@ -1476,7 +1476,7 @@
     int key,key2;
     unsigned long board_addr,board_size;
 
-    printk(">clgenfb_init()\n");
+    DEBUG printk(">clgenfb_init()\n");
     printk(KERN_INFO "clgen: Driver for Cirrus Logic based graphic boards, v" CLGEN_VERSION "\n");
 
     btype = -1;
@@ -1604,7 +1604,7 @@
 	return;
     }
 
-    printk("<clgenfb_init()\n");
+    DEBUG printk("<clgenfb_init()\n");
     return;
 }
 
@@ -1614,7 +1614,7 @@
 
 void clgenfb_cleanup(struct clgenfb_info *info)
 {
-    printk(">clgenfb_cleanup()\n");
+    DEBUG printk(">clgenfb_cleanup()\n");
 
     fb_info = info;
 
@@ -1625,8 +1625,8 @@
 	zorro_unconfig_board(info->keyREG, 0);
 
     unregister_framebuffer(&info->gen.info);
-    printk("Framebuffer unregistered\n");
-    printk("<clgenfb_cleanup()\n");
+    DEBUG printk("Framebuffer unregistered\n");
+    DEBUG printk("<clgenfb_cleanup()\n");
 }
 
 
@@ -1670,14 +1670,14 @@
 #ifdef MODULE
 int init_module(void)
 {
-    printk("init_module()\n");
+    DEBUG printk("init_module()\n");
     clgenfb_init();
     return 0;
 }
 
 void cleanup_module(void)
 {
-    printk("module_cleanup()\n");
+    DEBUG printk("module_cleanup()\n");
     clgenfb_cleanup(fb_info);
 }
 #endif /* MODULE */
@@ -1942,6 +1942,9 @@
 	/* now busy-wait until we're done */
 	while (RGfx(GR31) & 0x08)
 		;
+
+	WGfx(GR0, 0);
+	WGfx(GR1, 0);
 }
 
 /*******************************************************************



Reply to: