diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2018-06-25 11:01:12 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2018-06-25 11:01:12 +0000 |
| commit | 7705dd4df05b5e5c1661d118269d274604297c48 (patch) | |
| tree | 2a74daaaa1b643baa907efc58a1b5fcfa8ac000c /sys/dev/vt/hw | |
| parent | 120186ad8c93eba39f6c08b66f6dfc93fab1387b (diff) | |
Notes
Diffstat (limited to 'sys/dev/vt/hw')
| -rw-r--r-- | sys/dev/vt/hw/vga/vt_vga.c | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/sys/dev/vt/hw/vga/vt_vga.c b/sys/dev/vt/hw/vga/vt_vga.c index 773b0eaad3a5..1c7d312af225 100644 --- a/sys/dev/vt/hw/vga/vt_vga.c +++ b/sys/dev/vt/hw/vga/vt_vga.c @@ -48,9 +48,8 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcivar.h> #include <machine/bus.h> - -#if ((defined(__amd64__) || defined(__i386__)) && defined(DEV_ACPI)) -#include <contrib/dev/acpica/include/acpi.h> +#if defined(__amd64__) || defined(__i386__) +#include <machine/md_var.h> #endif struct vga_softc { @@ -1213,36 +1212,18 @@ vga_initialize(struct vt_device *vd, int textmode) static bool vga_acpi_disabled(void) { -#if ((defined(__amd64__) || defined(__i386__)) && defined(DEV_ACPI)) - ACPI_TABLE_FADT *fadt; - vm_paddr_t physaddr; +#if (defined(__amd64__) || defined(__i386__) uint16_t flags; int ignore; ignore = 0; TUNABLE_INT_FETCH("hw.vga.acpi_ignore_no_vga", &ignore); - - if (ignore) - return (false); - - physaddr = acpi_find_table(ACPI_SIG_FADT); - if (physaddr == 0) - return (false); - - fadt = acpi_map_table(physaddr, ACPI_SIG_FADT); - if (fadt == NULL) { - printf("vt_vga: unable to map FADT ACPI table\n"); - return (false); - } - - flags = fadt->BootFlags; - acpi_unmap_table(fadt); - - if (flags & ACPI_FADT_NO_VGA) - return (true); -#endif - + if (ignore || !acpi_get_fadt_bootflags(&flags)) + return (false); + return ((flags & ACPI_FADT_NO_VGA) != 0); +#else return (false); +#endif } static int |