d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If the VBE implementation does not support save/restore function, defer to

Browse Source 
VGA methods.  Unconditionally reset the VESA adapter before restoring state.
This commit is contained in:
Jung-uk Kim 2012-02-23 20:54:22 +00:00
parent e7d5cd47c5
commit 7e330e8220
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/fb/vesa.c
View File

@ -1451,15 +1451,13 @@ static int
vesa_save_state(video_adapter_t *adp, void *p, size_t size)
{
if (adp != vesa_adp)
if (adp != vesa_adp || vesa_state_buf_size == 0)
return ((*prevvidsw->save_state)(adp, p, size));
if (vesa_state_buf_size == 0)
return (1);
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 (1);
return (EINVAL);
((adp_state_t *)p)->sig = V_STATE_SIG;
bzero(((adp_state_t *)p)->regs, vesa_state_buf_size);
@ -1471,12 +1469,9 @@ vesa_load_state(video_adapter_t *adp, void *p)
{
int mode;
if ((adp != vesa_adp) || (((adp_state_t *)p)->sig != V_STATE_SIG))
if (adp != vesa_adp)
return ((*prevvidsw->load_state)(adp, p));
if (vesa_state_buf_size == 0)
return (1);
/* Try BIOS POST to restore a sane state. */
(void)vesa_bios_post();
mode = adp->va_mode;
@ -1484,6 +1479,8 @@ vesa_load_state(video_adapter_t *adp, void *p)
if (mode != adp->va_initial_mode)
(void)vesa_set_mode(adp, mode);
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));
}