Strange video mode output with VESA

[Jung-uk Kim]

On Friday 16 July 2010 03:22 pm, Jung-uk Kim wrote:
> On Friday 16 July 2010 03:00 pm, David DEMELIER wrote:
> > 2010/6/19 paradox <ddkprog at yahoo.com>:
> > >>On Wednesday 02 June 2010 04:25 pm, David DEMELIER wrote:
> > >>> Hi there,
> > >>>
> > >>> I was so happy to see that VESA is available for amd64, but
> > >>> unfortunately it does not work really well for me. Take a
> > >>> look at this picture :
> > >>>
> > >>> http://img717.imageshack.us/img717/7311/dsc00399h.jpg
> > >>>
> > >>> My laptop is a 15,6" so the best resolution is 1366x768, I
> > >>> tried this
> > >>>
> > >>> : vidcontrol MODE_496. As you can see on the picture all the
> > >>> : lines are
> > >>>
> > >>> completely everywhere, if I mouse the cursor they move away
> > >>> (I'm not drunk!).
> > >>>
> > >>> I have SC_PIXEL_MODE in my kernel config.
> > >>>
> > >>> The console terminal is okay until I don't excess 1280x960x32
> > >>> video mode.
> > >>>
> > >>> Do you have any idea to fix this ?
> > >>
> > >>It is kinda known problem. 占쏙옙If the mode has larger bytes per
> > >> scan line than the minimum, few characters per line are lost
> > >> when the screen is scrolled up or down, i.e., framebuffer
> > >> copies of whole screen. 占쏙옙When you move the mouse onto the
> > >> line, entire line is redrawn and restored. 占쏙옙That's what you
> > >> are seeing. 占쏙옙Ed might have a better idea how to fix it
> > >> (CC'ed).
> > >>
> > >>Jung-uk Kim
> > >
> > > this is incorrent calculate the scan lines in the vesa driver
> > > Jung-uk Kim should to fix it
> >
> > But Jung-uk Kim said Ed' should fix it so we are in an infinite
> > loop :-
>
> No, I didn't say that.  What I meant was "Ed may be a better
> qualified person to fix syscons vs. terminal emulator interaction
> issues." :-(

Can you please try the attached patch?
-------------- next part --------------
--- sys/dev/syscons/scvgarndr.c	2010-03-24 11:40:18.000000000 -0400
+++ sys/dev/syscons/scvgarndr.c	2010-07-16 19:05:12.000000000 -0400
@@ -728,12 +728,15 @@
 	vm_offset_t e;
 	u_char *f;
 	u_short col1, col2, color;
-	int line_width, pixel_size;
+	int line_width, off_width;
+	int font_size, pixel_size;
 	int i, j, k;
 	int a;
 
 	line_width = scp->sc->adp->va_line_width;
 	pixel_size = scp->sc->adp->va_info.vi_pixel_size;
+	off_width = line_width - scp->xpixel * pixel_size;
+	font_size = scp->font_size;
 
 	d = VIDEO_MEMORY_POS(scp, from, 8 * pixel_size);
 
@@ -752,9 +755,9 @@
 		}
 
 		e = d;
-		f = &(scp->font[sc_vtb_getc(&scp->vtb, i) * scp->font_size]);
+		f = &(scp->font[sc_vtb_getc(&scp->vtb, i) * font_size]);
 
-		for (j = 0; j < scp->font_size; ++j, ++f) {
+		for (j = 0; j < font_size; ++j, ++f) {
 			for (k = 0; k < 8; ++k) {
 				color = *f & (1 << (7 - k)) ? col1 : col2;
 				vga_drawpxl(e + pixel_size * k, color);
@@ -766,8 +769,8 @@
 		d += 8 * pixel_size;
 
 		if ((i % scp->xsize) == scp->xsize - 1)
-			d += scp->xoff * 16 * pixel_size +
-			     (scp->font_size - 1) * line_width;
+			d += off_width + scp->xoff * pixel_size * font_size +
+			    (font_size - 1) * line_width;
 	}
 }