 @@ -1,14 +1,14 @@
-/*	$NetBSD: intelfb.c,v 1.11 2015/03/05 17:50:41 riastradh Exp $	*/
+/*	$NetBSD: intelfb.c,v 1.12 2015/03/05 17:56:39 riastradh Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * 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.
 @@ -20,83 +20,66 @@
  * ``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: intelfb.c,v 1.11 2015/03/05 17:50:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.12 2015/03/05 17:56:39 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "vga.h"
 #endif
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #if NVGA > 0
 /*
  * XXX All we really need is vga_is_console from vgavar.h, but the
  * header files are missing their own dependencies, so we need to
  * explicitly drag in the other crap.
  */
 #include <dev/ic/mc6845reg.h>
 #include <dev/ic/pcdisplayvar.h>
 #include <dev/ic/vgareg.h>
 #include <dev/ic/vgavar.h>
 #endif
 #include <drm/drmP.h>
 #include <drm/drmfb.h>
 #include <drm/drmfb_pci.h>
 #include "i915_drv.h"
 #include "i915_pci.h"
 #include "intelfb.h"
 static int	intelfb_match(device_t, cfdata_t, void *);
 static void	intelfb_attach(device_t, device_t, void *);
 static int	intelfb_detach(device_t, int);
 static void	intelfb_attach_task(struct i915drmkms_task *);
 static bool	intel_is_vga_console(struct drm_device *);
 static bool	intelfb_shutdown(device_t, int);
 static paddr_t	intelfb_drmfb_mmapfb(struct drmfb_softc *, off_t, int);
 struct intelfb_softc {
 	struct drmfb_softc		sc_drmfb; /* XXX Must be first.  */
 	device_t			sc_dev;
 	struct intelfb_attach_args	sc_ifa;
 	bus_space_handle_t		sc_fb_bsh;
 	struct i915drmkms_task		sc_attach_task;
 	bool				sc_mapped:1;
 	bool				sc_scheduled:1;
 	bool				sc_attached:1;
 };
 static const struct drmfb_params intelfb_drmfb_params = {
 	.dp_mmapfb = intelfb_drmfb_mmapfb,
 	.dp_mmap = drmfb_pci_mmap,
 	.dp_ioctl = drmfb_pci_ioctl,
-	.dp_is_vga_console = intel_is_vga_console,
+	.dp_is_vga_console = drmfb_pci_is_vga_console,
 	.dp_disable_vga = i915_disable_vga,
 };
 CFATTACH_DECL_NEW(intelfb, sizeof(struct intelfb_softc),
     intelfb_match, intelfb_attach, intelfb_detach, NULL);
 static int
 intelfb_match(device_t parent, cfdata_t match, void *aux)
+{
 	return 1;
+}
 @@ -195,37 +178,26 @@ intelfb_attach_task(struct i915drmkms_ta
 		aprint_error_dev(sc->sc_dev, "failed to attach drmfb: %d\n",
 		    error);
 		return;
+	}
 	if (pmf_device_register1(sc->sc_dev, NULL, NULL, &intelfb_shutdown))
 		aprint_error_dev(sc->sc_dev,
 		    "failed to register shutdown handler\n");
 	sc->sc_attached = true;
+}
 static bool
 intel_is_vga_console(struct drm_device *dev)
 #if NVGA > 0
 	return vga_is_console(dev->pdev->pd_pa.pa_iot, -1);
 #else
 	return false;
 #endif
 static bool
 intelfb_shutdown(device_t self, int flags)
+{
 	struct intelfb_softc *const sc = device_private(self);
 	return drmfb_shutdown(&sc->sc_drmfb, flags);
+}
 static paddr_t
 intelfb_drmfb_mmapfb(struct drmfb_softc *drmfb, off_t offset, int prot)
+{
 	struct intelfb_softc *const sc = container_of(drmfb,
 	    struct intelfb_softc, sc_drmfb);
 	struct drm_fb_helper *const helper = sc->sc_ifa.ifa_fb_helper;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drmfb_pci.h,v 1.1 2015/03/05 17:50:41 riastradh Exp $	*/
+/*	$NetBSD: drmfb_pci.h,v 1.2 2015/03/05 17:56:39 riastradh Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * 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.
 @@ -30,15 +30,16 @@
  */
 #ifndef	_DRM_DRMFB_PCI_H_
 #define	_DRM_DRMFB_PCI_H_
 #include <sys/types.h>
 struct drmfb_softc;
 struct lwp;
 paddr_t	drmfb_pci_mmap(struct drmfb_softc *, off_t, int);
 int	drmfb_pci_ioctl(struct drmfb_softc *, unsigned long, void *, int,
 	    struct lwp *);
 bool	drmfb_pci_is_vga_console(struct drm_device *);
 #endif	/* _DRM_DRMFB_PCI_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drmfb_pci.c,v 1.1 2015/03/05 17:50:41 riastradh Exp $	*/
+/*	$NetBSD: drmfb_pci.c,v 1.2 2015/03/05 17:56:39 riastradh Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * 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.
 @@ -24,38 +24,54 @@
  * 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.
  */
 /*
  * drmfb_pci: drmfb hooks for PCI devices.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drmfb_pci.c,v 1.1 2015/03/05 17:50:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb_pci.c,v 1.2 2015/03/05 17:56:39 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "vga.h"
 #endif
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <dev/pci/pciio.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/wsdisplay_pci.h>
 #if NVGA > 0
 /*
  * XXX All we really need is vga_is_console from vgavar.h, but the
  * header files are missing their own dependencies, so we need to
  * explicitly drag in the other crap.
  */
 #include <dev/ic/mc6845reg.h>
 #include <dev/ic/pcdisplayvar.h>
 #include <dev/ic/vgareg.h>
 #include <dev/ic/vgavar.h>
 #endif
 #include <drm/drmP.h>
 #include <drm/drm_fb_helper.h>
 #include "drmfb.h"
 #include "drmfb_pci.h"
 /*
  * drmfb_pci_mmap: Implementation of drmfb_params::dp_mmap.  Don't use
  * this for dp_mmapfb -- how to get at the framebuffer is device-
  * specific.
  */
 paddr_t
 drmfb_pci_mmap(struct drmfb_softc *sc, off_t offset, int prot)
 @@ -122,13 +138,24 @@ drmfb_pci_ioctl(struct drmfb_softc *sc,
 	/* PCI-specific wsdisplay ioctls.  */
 	case WSDISPLAYIO_GET_BUSID:
 		return wsdisplayio_busid_pci(dev->dev, pa->pa_pc, pa->pa_tag,
 		    data);
 	case WSDISPLAYIO_GTYPE:
 		*(unsigned int *)data = WSDISPLAY_TYPE_PCIVGA;
 		return 0;
 	default:
 		return EPASSTHROUGH;
+	}
+}
 bool
 drmfb_pci_is_vga_console(struct drm_device *dev)
+{
 #if NVGA > 0
 	return vga_is_console(dev->pdev->pd_pa.pa_iot, -1);
 #else
 	return false;
 #endif
+}