From owner-svn-src-head@FreeBSD.ORG  Mon Sep 13 19:58:46 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 A01BE1065670;
	Mon, 13 Sep 2010 19:58:46 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FF1D8FC12;
	Mon, 13 Sep 2010 19:58:46 +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 o8DJwk8S028910;
	Mon, 13 Sep 2010 19:58:46 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8DJwkUr028908;
	Mon, 13 Sep 2010 19:58:46 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201009131958.o8DJwkUr028908@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 13 Sep 2010 19:58:46 +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: r212580 - head/sys/dev/fb
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Sep 2010 19:58:46 -0000

Author: jkim
Date: Mon Sep 13 19:58:46 2010
New Revision: 212580
URL: http://svn.freebsd.org/changeset/base/212580

Log:
  Fix segment:offset calculation of interrupt vector for relocated video BIOS
  when the original offset is bigger than size of one page.  X86BIOS macros
  cannot be used here because it is assumed address is only linear in a page.
  
  Tested by:	netchild

Modified:
  head/sys/dev/fb/vesa.c

Modified: head/sys/dev/fb/vesa.c
==============================================================================
--- head/sys/dev/fb/vesa.c	Mon Sep 13 19:55:40 2010	(r212579)
+++ head/sys/dev/fb/vesa.c	Mon Sep 13 19:58:46 2010	(r212580)
@@ -804,18 +804,16 @@ vesa_bios_init(void)
 		vbios = x86bios_get_orm(vesa_bios_offs);
 		if (vbios != NULL) {
 			vesa_bios_size = vbios[2] * 512;
-			offs = BIOS_SADDRTOLADDR(vesa_bios_int10);
-			if (offs > vesa_bios_offs &&
-			    offs < vesa_bios_offs + vesa_bios_size) {
+			if (((VESA_BIOS_OFFSET << 12) & 0xffff0000) ==
+			    (vesa_bios_int10 & 0xffff0000) &&
+			    vesa_bios_size > (vesa_bios_int10 & 0xffff)) {
 				vesa_bios = x86bios_alloc(&vesa_bios_offs,
 				    vesa_bios_size, M_WAITOK);
 				memcpy(vesa_bios, vbios, vesa_bios_size);
-				offs = offs - VESA_BIOS_OFFSET + vesa_bios_offs;
-				offs = (X86BIOS_PHYSTOSEG(offs) << 16) +
-				    X86BIOS_PHYSTOOFF(offs);
+				offs = ((vesa_bios_offs << 12) & 0xffff0000) +
+				    (vesa_bios_int10 & 0xffff);
 				x86bios_set_intr(0x10, offs);
-			} else
-				offs = vesa_bios_int10;
+			}
 		}
 		if (vesa_bios == NULL)
 			printf("VESA: failed to shadow video ROM\n");