summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2008-07-31 14:05:05 +0000
committerjoerg <joerg@NetBSD.org>2008-07-31 14:05:05 +0000
commit0b2a6aef8430ed45db1db58ff49ee2bb6ac045ab (patch)
tree3cc506376dbb51f083c0eaa96a93dceee429e347 /sys/dev
parent4a733c2463c6d232cca26aa5c07acf735a0068de (diff)
machdep.acpi_vbios_reset = 2 --> vga_pci_resume will use x86emu to do a
POST when options VGA_POST is present.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/vga_pci.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 3d524a0a940..e8bd2b7bc3f 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_pci.c,v 1.42 2008/05/18 19:54:11 jmcneill Exp $ */
+/* $NetBSD: vga_pci.c,v 1.43 2008/07/31 14:05:05 joerg Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.42 2008/05/18 19:54:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.43 2008/07/31 14:05:05 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -263,12 +263,15 @@ vga_pci_rescan(struct device *self, const char *ifattr, const int *locators)
static bool
vga_pci_resume(device_t dv PMF_FN_ARGS)
{
+#ifdef VGA_POST
+ extern int acpi_md_vbios_reset;
+#endif
struct vga_pci_softc *sc = device_private(dv);
vga_resume(&sc->sc_vga);
#ifdef VGA_POST
- if (sc->sc_posth != NULL)
+ if (sc->sc_posth != NULL && acpi_md_vbios_reset == 2)
vga_post_call(sc->sc_posth);
#endif