 @@ -1,14 +1,14 @@
-/*	$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
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/kauth.h>
 #include <dev/pci/pcidevs.h>
 @@ -56,26 +56,27 @@ __KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,
 #ifdef GENFB_PCI_DEBUG
 # define DPRINTF printf
 #else
 # define DPRINTF while (0) printf
 #endif
 static int	pci_genfb_match(device_t, cfdata_t, void *);
 static void	pci_genfb_attach(device_t, device_t, void *);
 static int	pci_genfb_ioctl(void *, void *, u_long, void *, int,
 		    struct lwp *);
 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);
 static int
 pci_genfb_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	int matchlvl = 1;
 	if (!genfb_is_enabled())
 		return 0;	/* explicitly disabled by MD code */
 @@ -107,31 +108,33 @@ pci_genfb_attach(device_t parent, device
 	aprint_normal(": %s\n", devinfo);
 	sc->sc_gen.sc_dev = self;
 	sc->sc_memt = pa->pa_memt;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	sc->sc_want_wsfb = 0;
 	genfb_init(&sc->sc_gen);
 	/* 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");
 		return;
+	}
 	if (bus_space_map(sc->sc_memt, sc->sc_gen.sc_fboffset,
 	    sc->sc_gen.sc_fbsize, BUS_SPACE_MAP_LINEAR, &sc->sc_memh) != 0) {
 		aprint_error_dev(self, "unable to map the framebuffer\n");
 		return;
+	}
 	sc->sc_gen.sc_fbaddr = bus_space_vaddr(sc->sc_memt, sc->sc_memh);
 @@ -316,13 +319,20 @@ int
 pci_genfb_borrow(void *opaque, bus_addr_t addr, bus_space_handle_t *hdlp)
+{
 	struct pci_genfb_softc *sc = opaque;
 	if (sc == NULL)
 		return 0;
 	if (!sc->sc_gen.sc_fboffset)
 		return 0;
 	if (sc->sc_gen.sc_fboffset != addr)
 		return 0;
 	*hdlp = sc->sc_memh;
 	return 1;
+}
 static bool
 pci_genfb_shutdown(device_t self, int flags)
+{
 	genfb_enable_polling(self);
 	return true;
+}