Partially revert 196524: this part of change should not be committed as

part of the changeset - it's an unrelated one.

Reported by:	danfe

1 files changed, 25 insertions, 20 deletions

diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 2cb1976..736daff 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -1074,11 +1074,6 @@ vesa_set_mode(video_adapter_t *adp, int mode)
 		(info.vi_flags & V_INFO_COLOR) ? V_ADP_COLOR : 0;
 	vesa_adp->va_crtc_addr =
 		(vesa_adp->va_flags & V_ADP_COLOR) ? COLOR_CRTC : MONO_CRTC;
-
-	vesa_adp->va_window = BIOS_PADDRTOVADDR(info.vi_window);
-	vesa_adp->va_window_size = info.vi_window_size;
-	vesa_adp->va_window_gran = info.vi_window_gran;
-
 	if (info.vi_flags & V_INFO_LINEAR) {
 #if VESA_DEBUG > 1
 		printf("VESA: setting up LFB\n");
@@ -1088,31 +1083,41 @@ vesa_set_mode(video_adapter_t *adp, int mode)
 					vesa_adp_info->v_memsize*64*1024);
 		vesa_adp->va_buffer_size = info.vi_buffer_size;
 		vesa_adp->va_window = vesa_adp->va_buffer;
+		vesa_adp->va_window_size = info.vi_buffer_size/info.vi_planes;
+		vesa_adp->va_window_gran = info.vi_buffer_size/info.vi_planes;
 	} else {
 		vesa_adp->va_buffer = 0;
-		vesa_adp->va_buffer_size = 0;
+		vesa_adp->va_buffer_size = info.vi_buffer_size;
+		vesa_adp->va_window = BIOS_PADDRTOVADDR(info.vi_window);
+		vesa_adp->va_window_size = info.vi_window_size;
+		vesa_adp->va_window_gran = info.vi_window_gran;
 	}
-#if VESA_DEBUG > 1
-	printf("VESA: buffer %x, buffer_size %d, window %x, window_size %d\n",
-			vesa_adp->va_buffer,
-			vesa_adp->va_buffer_size,
-			vesa_adp->va_window,
-			vesa_adp->va_window_size);
-#endif
 	vesa_adp->va_window_orig = 0;
 	len = vesa_bios_get_line_length();
-	if (info.vi_flags & V_INFO_GRAPHICS) {
-		switch (info.vi_depth) {
+	if (len > 0) {
+		vesa_adp->va_line_width = len;
+	} else if (info.vi_flags & V_INFO_GRAPHICS) {
+		switch (info.vi_depth/info.vi_planes) {
+		case 1:
+			vesa_adp->va_line_width = info.vi_width/8;
+			break;
+		case 2:
+			vesa_adp->va_line_width = info.vi_width/4;
+			break;
 		case 4:
-			vesa_adp->va_line_width = info.vi_width;
+			vesa_adp->va_line_width = info.vi_width/2;
 			break;
 		case 8:
+		default: /* shouldn't happen */
+			vesa_adp->va_line_width = info.vi_width;
+			break;
 		case 15:
 		case 16:
+			vesa_adp->va_line_width = info.vi_width*2;
+			break;
 		case 24:
 		case 32:
-		default:
-			vesa_adp->va_line_width = info.vi_width * (info.vi_depth / 8);
+			vesa_adp->va_line_width = info.vi_width*4;
 			break;
 		}
 	} else {
@@ -1121,8 +1126,8 @@ vesa_set_mode(video_adapter_t *adp, int mode)
 	vesa_adp->va_disp_start.x = 0;
 	vesa_adp->va_disp_start.y = 0;
 #if VESA_DEBUG > 0
-	printf("vesa_set_mode(): vi_width:%d, len:%d, line_width:%d vi_mem_model:%d\n",
-	       info.vi_width, len, vesa_adp->va_line_width, info.vi_mem_model);
+	printf("vesa_set_mode(): vi_width:%d, len:%d, line_width:%d\n",
+	       info.vi_width, len, vesa_adp->va_line_width);
 #endif
 	bcopy(&info, &vesa_adp->va_info, sizeof(vesa_adp->va_info));