From: Knut Petersen <Knut_Petersen@t-online.de>

Cyblafb silently assumes that there is no drawing operation with width >
4096 and height > 4096.  This is ok for almost all cases as monitors of
such dimensions are uncommon ...  I donīt know of such a beast.  But
bit_clear_margins() tries to fill the entire right margin with one call to
the drivers fillrect function.  In that case height > 4096 is often true. 
This problem and also the basestride calculation is fixed with this patch.

Some whitespace fixes are included, too.

Signed-off-by: Knut Petersen <Knut_Petersen@t-online.de>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/video/cyblafb.c |   46 ++++++++++++++++++++++++++--------------------
 1 files changed, 26 insertions(+), 20 deletions(-)

diff -puN drivers/video/cyblafb.c~fbdev-fixed-and-updated-cyblafb-fix drivers/video/cyblafb.c
--- devel/drivers/video/cyblafb.c~fbdev-fixed-and-updated-cyblafb-fix	2006-01-03 21:57:00.000000000 -0800
+++ devel-akpm/drivers/video/cyblafb.c	2006-01-03 21:57:00.000000000 -0800
@@ -23,7 +23,7 @@
 #include <asm/types.h>
 #include <video/cyblafb.h>
 
-#define VERSION "0.60"
+#define VERSION "0.61"
 
 struct cyblafb_par {
 	u32 pseudo_pal[16];
@@ -301,7 +301,7 @@ static void cyblafb_fillrect(struct fb_i
 			     const struct fb_fillrect *fr)
 {
 	int bpp = info->var.bits_per_pixel;
-	int col;
+	u32 col, height, desty;
 
 	switch (bpp) {
 		default:
@@ -316,14 +316,24 @@ static void cyblafb_fillrect(struct fb_i
 			 break;
 	}
 
-	out32(GEB8,basestride |
-		   (((fr->dy >> 3) * info->var.xres_virtual * bpp) >> 3));
-	out32(GE60,col);
-	out32(GE48,fr->rop ? 0x66:ROP_S);
-	out32(GE44,0x20000000|1<<19|1<<4|2<<2);
-	out32(GE08,point(fr->dx,0));
-	out32(GE0C,point(fr->dx+fr->width-1,(fr->dy % 8) + fr->height-1));
-
+	height = fr->height;
+	desty = fr->dy;
+	while(height) {
+		out32(GEB8,basestride | ((desty * info->var.xres_virtual *
+					bpp) >> 6));
+		out32(GE60,col);
+		out32(GE48,fr->rop ? 0x66:ROP_S);
+		out32(GE44,0x20000000|1<<19|1<<4|2<<2);
+		out32(GE08,point(fr->dx,0));
+		if (height > 4096) {
+			out32(GE0C,point(fr->dx+fr->width-1,4095));
+			height -= 4096;
+			desty += 4096;
+		} else {
+			out32(GE0C,point(fr->dx+fr->width-1,height-1));
+			return;
+		}
+	}
 }
 
 //==============================
@@ -357,7 +367,6 @@ static void cyblafb_copyarea(struct fb_i
 	out32(GE04,direction?s1:s2);
 	out32(GE08,direction?d2:d1);
 	out32(GE0C,direction?d1:d2);
-
 }
 
 //=======================================================================
@@ -421,8 +430,8 @@ static void cyblafb_imageblit(struct fb_
 			 break;
 	}
 
-	out32(GEB8,basestride |
-		   ((image->dy * info->var.xres_virtual * bpp) >> 6));
+	out32(GEB8,basestride | ((image->dy * info->var.xres_virtual *
+				bpp) >> 6));
 	out32(GE60,fgcol);
 	out32(GE64,bgcol);
 	out32(GE44,0xa0000000 | 1<<20 | 1<<19);
@@ -462,7 +471,6 @@ static void cyblafb_imageblit(struct fb_
 static int cyblafb_check_var(struct fb_var_screeninfo *var,
 			     struct fb_info *info)
 {
-
 	int bpp = var->bits_per_pixel;
 
 	//
@@ -555,7 +563,6 @@ static int cyblafb_check_var(struct fb_v
 	}
 
 	return 0;
-
 }
 
 //=====================================================================
@@ -1001,14 +1008,14 @@ static int cyblafb_blank(int blank_mode,
 	if (displaytype == DISPLAY_FP)
 		return 0;
 
-	out8(0x83C8,0x04); 		// DPMS Control
+	out8(0x83C8,0x04);		// DPMS Control
 	PMCont = in8(0x83C6) & 0xFC;
 
 	DPMSCont = read3CE(GR23) & 0xFC;
 
 	switch (blank_mode)
 	{
-	case FB_BLANK_UNBLANK:       // Screen: On, HSync: On, VSync: On
+	case FB_BLANK_UNBLANK:	     // Screen: On, HSync: On, VSync: On
 	case FB_BLANK_NORMAL:	     // Screen: Off, HSync: On, VSync: On
 		PMCont |= 0x03;
 		DPMSCont |= 0x00;
@@ -1081,9 +1088,9 @@ static int __devinit getstartupmode(stru
 		int left_margin; int right_margin; int upper_margin;
 		int lower_margin; int hsync_len; int vsync_len;
 	}  modedb[5] = {
-		{   0, 2048,    0, 4096, 0, 0,   0,  0,  0, 0,   0,  0},
+		{   0, 2048,	0, 4096, 0, 0,	 0,  0,  0, 0,	 0,  0},
 		{ 640, 2048,  480, 4096, 0, 0, -40, 24, 17, 0, 216,  3},
-		{ 800, 2048,  600, 4096, 0, 0,  96, 24, 14, 0, 136, 11},
+		{ 800, 2048,  600, 4096, 0, 0,	96, 24, 14, 0, 136, 11},
 		{1024, 2048,  768, 4096, 0, 0, 144, 24, 29, 0, 120,  3},
 		{1280, 2048, 1024, 4096, 0, 0, 232, 16, 39, 0, 160,  3}
 	};
@@ -1224,7 +1231,6 @@ static int __devinit getstartupmode(stru
 	}
 
 	return 0;
-
 }
 
 //========================================================
_