Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci switch genfb to polling mode at shutdown



details:   https://anonhg.NetBSD.org/src/rev/ca224cdd75ef
branches:  trunk
changeset: 761852:ca224cdd75ef
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Feb 09 13:19:53 2011 +0000

description:
switch genfb to polling mode at shutdown

diffstat:

 sys/dev/pci/genfb_pci.c |  20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 65cf114e25d7 -r ca224cdd75ef sys/dev/pci/genfb_pci.c
--- a/sys/dev/pci/genfb_pci.c   Wed Feb 09 13:19:18 2011 +0000
+++ b/sys/dev/pci/genfb_pci.c   Wed Feb 09 13:19:53 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfb_pci.c,v 1.27 2011/01/22 15:14:28 cegger Exp $ */
+/*     $NetBSD: genfb_pci.c,v 1.28 2011/02/09 13:19:53 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.27 2011/01/22 15:14:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.28 2011/02/09 13:19:53 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,6 +66,7 @@
 static paddr_t pci_genfb_mmap(void *, void *, off_t, int);
 static int     pci_genfb_borrow(void *, bus_addr_t, bus_space_handle_t *);
 static int     pci_genfb_drm_print(void *, const char *);
+static bool    pci_genfb_shutdown(device_t, int);
 
 CFATTACH_DECL_NEW(genfb_pci, sizeof(struct pci_genfb_softc),
     pci_genfb_match, pci_genfb_attach, NULL, NULL);
@@ -117,11 +118,13 @@
 
        /* firmware / MD code responsible for restoring the display */
        if (sc->sc_gen.sc_pmfcb == NULL)
-               pmf_device_register(self, NULL, NULL);
+               pmf_device_register1(self, NULL, NULL,
+                   pci_genfb_shutdown);
        else
-               pmf_device_register(self,
+               pmf_device_register1(self,
                    sc->sc_gen.sc_pmfcb->gpc_suspend,
-                   sc->sc_gen.sc_pmfcb->gpc_resume);
+                   sc->sc_gen.sc_pmfcb->gpc_resume,
+                   pci_genfb_shutdown);
 
        if ((sc->sc_gen.sc_width == 0) || (sc->sc_gen.sc_fbsize == 0)) {
                aprint_debug_dev(self, "not configured by firmware\n");
@@ -326,3 +329,10 @@
        *hdlp = sc->sc_memh;
        return 1;
 }
+
+static bool
+pci_genfb_shutdown(device_t self, int flags)
+{
+       genfb_enable_polling(self);
+       return true;
+}



Home | Main Index | Thread Index | Old Index