[src/trunk]: src/sys/dev/wsfb genfb_enable/disable_polling only matters if ge...

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

details:   https://anonhg.NetBSD.org/src/rev/ee628975e504
branches:  trunk
changeset: 762498:ee628975e504
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Feb 22 01:26:14 2011 +0000

description:
genfb_enable/disable_polling only matters if genfb is the console screen,
so make it a noop if it's not

diffstat:

 sys/dev/wsfb/genfb.c |  16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 2adc392862cf -r ee628975e504 sys/dev/wsfb/genfb.c
--- a/sys/dev/wsfb/genfb.c      Tue Feb 22 01:11:30 2011 +0000
+++ b/sys/dev/wsfb/genfb.c      Tue Feb 22 01:26:14 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfb.c,v 1.37 2011/02/18 13:56:58 jmcneill Exp $ */
+/*     $NetBSD: genfb.c,v 1.38 2011/02/22 01:26:14 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.37 2011/02/18 13:56:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.38 2011/02/22 01:26:14 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -691,9 +691,11 @@
 {
        struct genfb_softc *sc = device_private(dev);
 
-       SCREEN_ENABLE_DRAWING(&sc->sc_console_screen);
-       vcons_hard_switch(&sc->sc_console_screen);
-       vcons_enable_polling(&sc->vd);
+       if (sc->sc_console_screen.scr_vd) {
+               SCREEN_ENABLE_DRAWING(&sc->sc_console_screen);
+               vcons_hard_switch(&sc->sc_console_screen);
+               vcons_enable_polling(&sc->vd);
+       }
 }
 
 void
@@ -701,5 +703,7 @@
 {
        struct genfb_softc *sc = device_private(dev);
 
-       vcons_disable_polling(&sc->vd);
+       if (sc->sc_console_screen.scr_vd) {
+               vcons_disable_polling(&sc->vd);
+       }
 }