From owner-svn-src-head@FreeBSD.ORG  Mon Mar 19 17:14:13 2012
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 35902106564A;
	Mon, 19 Mar 2012 17:14:13 +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 211A68FC0C;
	Mon, 19 Mar 2012 17:14:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2JHECYO078096;
	Mon, 19 Mar 2012 17:14:12 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2JHECR1078093;
	Mon, 19 Mar 2012 17:14:12 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201203191714.q2JHECR1078093@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 19 Mar 2012 17:14:12 +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: r233187 - 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, 19 Mar 2012 17:14:13 -0000

Author: jkim
Date: Mon Mar 19 17:14:12 2012
New Revision: 233187
URL: http://svn.freebsd.org/changeset/base/233187

Log:
  Do not reuse the previous address when restoring linear frame buffer.

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

Modified: head/sys/dev/fb/vesa.c
==============================================================================
--- head/sys/dev/fb/vesa.c	Mon Mar 19 16:13:14 2012	(r233186)
+++ head/sys/dev/fb/vesa.c	Mon Mar 19 17:14:12 2012	(r233187)
@@ -1478,7 +1478,8 @@ vesa_save_state(video_adapter_t *adp, vo
 		vesa_vmem_buf = malloc(bsize, M_DEVBUF, M_NOWAIT);
 		if (vesa_vmem_buf != NULL)
 			bcopy((void *)buf, vesa_vmem_buf, bsize);
-	}
+	} else
+		vesa_vmem_buf = NULL;
 	((adp_state_t *)p)->sig = V_STATE_SIG;
 	bzero(((adp_state_t *)p)->regs, vesa_state_buf_size);
 	return (vesa_bios_save_restore(STATE_SAVE, ((adp_state_t *)p)->regs));
@@ -1496,7 +1497,6 @@ vesa_load_state(video_adapter_t *adp, vo
 
 	/* Try BIOS POST to restore a sane state. */
 	(void)vesa_bios_post();
-	buf = adp->va_buffer;
 	bsize = adp->va_buffer_size;
 	mode = adp->va_mode;
 	(void)vesa_set_mode(adp, adp->va_initial_mode);
@@ -1505,8 +1505,10 @@ vesa_load_state(video_adapter_t *adp, vo
 
 	if (((adp_state_t *)p)->sig != V_STATE_SIG)
 		return ((*prevvidsw->load_state)(adp, p));
-	if (buf != 0 && vesa_vmem_buf != NULL) {
-		bcopy(vesa_vmem_buf, (void *)buf, bsize);
+	if (vesa_vmem_buf != NULL) {
+		buf = adp->va_buffer;
+		if (buf != 0)
+			bcopy(vesa_vmem_buf, (void *)buf, bsize);
 		free(vesa_vmem_buf, M_DEVBUF);
 	}
 	return (vesa_bios_save_restore(STATE_LOAD, ((adp_state_t *)p)->regs));