mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-01 12:19:28 +00:00
Code Issues Releases Activity

Use M_WAITOK for VESA BIOS initialization consistently.

Browse Source
This commit is contained in:
Jung-uk Kim 2010-06-23 23:34:56 +00:00
parent e864acd42f
commit 28ef508f86
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=209491
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,7 +164,7 @@ static char *vesa_revstr = NULL;
static int int10_set_mode(int mode);
static int vesa_bios_post(void);
static int vesa_bios_get_mode(int mode, struct vesa_mode *vmode);
static int vesa_bios_get_mode(int mode, struct vesa_mode *vmode, int flags);
static int vesa_bios_set_mode(int mode);
#if 0
static int vesa_bios_get_dac(void);
@ -278,13 +278,13 @@ vesa_bios_post(void)
/* VESA BIOS calls */
static int
vesa_bios_get_mode(int mode, struct vesa_mode *vmode)
vesa_bios_get_mode(int mode, struct vesa_mode *vmode, int flags)
{
x86regs_t regs;
uint32_t offs;
void *buf;
buf = x86bios_alloc(&offs, sizeof(*vmode), M_NOWAIT);
buf = x86bios_alloc(&offs, sizeof(*vmode), flags);
if (buf == NULL)
return (1);
@ -856,7 +856,7 @@ vesa_bios_init(void)
for (i = 0, modes = 0; (i < (M_VESA_MODE_MAX - M_VESA_BASE + 1)) &&
(vesa_vmodetab[i] != 0xffff); ++i) {
vesa_vmodetab[i] = le16toh(vesa_vmodetab[i]);
if (vesa_bios_get_mode(vesa_vmodetab[i], &vmode))
if (vesa_bios_get_mode(vesa_vmodetab[i], &vmode, M_WAITOK))
continue;
vmode.v_modeattr = le16toh(vmode.v_modeattr);
@ -1788,7 +1788,7 @@ vesa_bios_info(int level)
for (i = 0;
(i < (M_VESA_MODE_MAX - M_VESA_BASE + 1))
&& (vesa_vmodetab[i] != 0xffff); ++i) {
if (vesa_bios_get_mode(vesa_vmodetab[i], &vmode))
if (vesa_bios_get_mode(vesa_vmodetab[i], &vmode, M_NOWAIT))
continue;
/* print something for diagnostic purpose */