svn commit: r231843 - head/sys/dev/fb

[Jung-uk Kim]

Author: jkim
Date: Thu Feb 16 22:51:44 2012
New Revision: 231843
URL: http://svn.freebsd.org/changeset/base/231843

Log:
  Set the initial mode for the adapter after executing VESA BIOS POST.
  There is no need to set initial mode for BIOS.

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

Modified: head/sys/dev/fb/vesa.c
==============================================================================
--- head/sys/dev/fb/vesa.c	Thu Feb 16 22:46:00 2012	(r231842)
+++ head/sys/dev/fb/vesa.c	Thu Feb 16 22:51:44 2012	(r231843)
@@ -1469,6 +1469,7 @@ vesa_save_state(video_adapter_t *adp, vo
 static int
 vesa_load_state(video_adapter_t *adp, void *p)
 {
+	int mode;
 
 	if ((adp != vesa_adp) || (((adp_state_t *)p)->sig != V_STATE_SIG))
 		return ((*prevvidsw->load_state)(adp, p));
@@ -1478,8 +1479,10 @@ 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);
+	mode = adp->va_mode;
+	(void)vesa_set_mode(adp, adp->va_initial_mode);
+	if (mode != adp->va_initial_mode);
+		(void)vesa_set_mode(adp, mode);
 
 	return (vesa_bios_save_restore(STATE_LOAD, ((adp_state_t *)p)->regs));
 }