From owner-svn-src-head@FreeBSD.ORG Mon Aug 31 17:34:11 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B57B106566B; Mon, 31 Aug 2009 17:34:11 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5F2D38FC1B; Mon, 31 Aug 2009 17:34:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7VHYBWc034204; Mon, 31 Aug 2009 17:34:11 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7VHYB3X034202; Mon, 31 Aug 2009 17:34:11 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200908311734.n7VHYB3X034202@svn.freebsd.org> From: Xin LI Date: Mon, 31 Aug 2009 17:34:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196704 - head/sys/i386/isa X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2009 17:34:11 -0000 Author: delphij Date: Mon Aug 31 17:34:11 2009 New Revision: 196704 URL: http://svn.freebsd.org/changeset/base/196704 Log: Partially revert 196524: this part of change should not be committed as part of the changeset - it's an unrelated one. Reported by: danfe Modified: head/sys/i386/isa/vesa.c Modified: head/sys/i386/isa/vesa.c ============================================================================== --- head/sys/i386/isa/vesa.c Mon Aug 31 16:27:00 2009 (r196703) +++ head/sys/i386/isa/vesa.c Mon Aug 31 17:34:11 2009 (r196704) @@ -1074,11 +1074,6 @@ vesa_set_mode(video_adapter_t *adp, int (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 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 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));