From owner-svn-src-all@FreeBSD.ORG  Tue May 18 22:30:55 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D41DA106566B;
	Tue, 18 May 2010 22:30:55 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C390A8FC15;
	Tue, 18 May 2010 22:30:55 +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 o4IMUtbm086581;
	Tue, 18 May 2010 22:30:55 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4IMUtjf086579;
	Tue, 18 May 2010 22:30:55 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201005182230.o4IMUtjf086579@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 18 May 2010 22:30:55 +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: r208279 - head/sys/dev/fb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 May 2010 22:30:55 -0000

Author: jkim
Date: Tue May 18 22:30:55 2010
New Revision: 208279
URL: http://svn.freebsd.org/changeset/base/208279

Log:
  Restore the previous VESA mode after BIOS POST, just in case.

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

Modified: head/sys/dev/fb/vesa.c
==============================================================================
--- head/sys/dev/fb/vesa.c	Tue May 18 21:23:51 2010	(r208278)
+++ head/sys/dev/fb/vesa.c	Tue May 18 22:30:55 2010	(r208279)
@@ -1443,6 +1443,7 @@ vesa_load_state(video_adapter_t *adp, vo
 	/* Try BIOS POST to restore a sane state. */
 	(void)vesa_bios_post();
 	(void)int10_set_mode(adp->va_initial_bios_mode);
+	(void)vesa_set_mode(adp, adp->va_mode);
 
 	return (vesa_bios_save_restore(STATE_LOAD, ((adp_state_t *)p)->regs,
 	    vesa_state_buf_size));