[src/netbsd-7]: src/sys/arch/x86/pci Pull up following revision(s) (requested...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9a9590ac48fb
branches:  netbsd-7
changeset: 798894:9a9590ac48fb
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jan 25 08:25:11 2015 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #451):
        sys/arch/x86/pci/pci_machdep.c: revision 1.68
we don't need to keep track of curmode if not vga_post.

diffstat:

 sys/arch/x86/pci/pci_machdep.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r e2ad86089a3a -r 9a9590ac48fb sys/arch/x86/pci/pci_machdep.c
--- a/sys/arch/x86/pci/pci_machdep.c    Sun Jan 25 08:22:12 2015 +0000
+++ b/sys/arch/x86/pci/pci_machdep.c    Sun Jan 25 08:25:11 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.67 2014/05/06 18:54:34 christos Exp $        */
+/*     $NetBSD: pci_machdep.c,v 1.67.2.1 2015/01/25 08:25:11 martin Exp $      */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.67 2014/05/06 18:54:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.67.2.1 2015/01/25 08:25:11 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -789,24 +789,28 @@
 x86_genfb_setmode(struct genfb_softc *sc, int newmode)
 {
 #if NGENFB > 0
+# if NACPICA > 0 && defined(VGA_POST)
        static int curmode = WSDISPLAYIO_MODE_EMUL;
+# endif
 
        switch (newmode) {
        case WSDISPLAYIO_MODE_EMUL:
                x86_genfb_mtrr_init(sc->sc_fboffset,
                    sc->sc_height * sc->sc_stride);
-#if NACPICA > 0 && defined(VGA_POST)
+# if NACPICA > 0 && defined(VGA_POST)
                if (curmode != newmode) {
                        if (vga_posth != NULL && acpi_md_vesa_modenum != 0) {
                                vga_post_set_vbe(vga_posth,
                                    acpi_md_vesa_modenum);
                        }
                }
-#endif
+# endif
                break;
        }
 
+# if NACPICA > 0 && defined(VGA_POST)
        curmode = newmode;
+# endif
 #endif
        return true;
 }