From owner-svn-src-head@FreeBSD.ORG Wed Apr 4 22:02:55 2012 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 4CFD01065676; Wed, 4 Apr 2012 22:02:55 +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 1CEFE8FC19; Wed, 4 Apr 2012 22:02:55 +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 q34M2sLb027101; Wed, 4 Apr 2012 22:02:54 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q34M2sLT027099; Wed, 4 Apr 2012 22:02:54 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201204042202.q34M2sLT027099@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 4 Apr 2012 22:02:54 +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: r233896 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Apr 2012 22:02:55 -0000 Author: jkim Date: Wed Apr 4 22:02:54 2012 New Revision: 233896 URL: http://svn.freebsd.org/changeset/base/233896 Log: Save and restore VGA display memory between suspend and resume. Modified: head/sys/dev/fb/vesa.c Modified: head/sys/dev/fb/vesa.c ============================================================================== --- head/sys/dev/fb/vesa.c Wed Apr 4 21:49:49 2012 (r233895) +++ head/sys/dev/fb/vesa.c Wed Apr 4 22:02:54 2012 (r233896) @@ -1465,22 +1465,30 @@ vesa_save_state(video_adapter_t *adp, vo vm_offset_t buf; size_t bsize; - if (adp != vesa_adp || vesa_state_buf_size == 0) + if (adp != vesa_adp || (size == 0 && vesa_state_buf_size == 0)) return ((*prevvidsw->save_state)(adp, p, size)); + bsize = offsetof(adp_state_t, regs) + vesa_state_buf_size; if (size == 0) - return (offsetof(adp_state_t, regs) + vesa_state_buf_size); - if (size < (offsetof(adp_state_t, regs) + vesa_state_buf_size)) + return (bsize); + if (vesa_state_buf_size > 0 && size < bsize) return (EINVAL); - buf = adp->va_buffer; - if (buf != 0) { + if (VESA_MODE(adp->va_mode) && adp->va_buffer != 0) { + buf = adp->va_buffer; bsize = adp->va_buffer_size; + } else { + buf = adp->va_window; + bsize = adp->va_window_size; + } + if (buf != 0) { 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; + if (vesa_state_buf_size == 0) + return ((*prevvidsw->save_state)(adp, p, size)); ((adp_state_t *)p)->sig = V_STATE_SIG; return (vesa_bios_save_restore(STATE_SAVE, ((adp_state_t *)p)->regs)); } @@ -1490,27 +1498,34 @@ vesa_load_state(video_adapter_t *adp, vo { vm_offset_t buf; size_t bsize; - int mode; + int error, mode; if (adp != vesa_adp) return ((*prevvidsw->load_state)(adp, p)); /* Try BIOS POST to restore a sane state. */ (void)vesa_bios_post(); - bsize = adp->va_buffer_size; mode = adp->va_mode; - (void)vesa_set_mode(adp, adp->va_initial_mode); + error = vesa_set_mode(adp, adp->va_initial_mode); if (mode != adp->va_initial_mode) - (void)vesa_set_mode(adp, mode); + error = vesa_set_mode(adp, mode); - if (((adp_state_t *)p)->sig != V_STATE_SIG) - return ((*prevvidsw->load_state)(adp, p)); if (vesa_vmem_buf != NULL) { - buf = adp->va_buffer; - if (buf != 0) - bcopy(vesa_vmem_buf, (void *)buf, bsize); + if (error == 0) { + if (VESA_MODE(mode) && adp->va_buffer != 0) { + buf = adp->va_buffer; + bsize = adp->va_buffer_size; + } else { + buf = adp->va_window; + bsize = adp->va_window_size; + } + if (buf != 0) + bcopy(vesa_vmem_buf, (void *)buf, bsize); + } free(vesa_vmem_buf, M_DEVBUF); } + if (((adp_state_t *)p)->sig != V_STATE_SIG) + return ((*prevvidsw->load_state)(adp, p)); return (vesa_bios_save_restore(STATE_LOAD, ((adp_state_t *)p)->regs)); }