 @@ -167,33 +167,35 @@ static int drm_addmap_core(struct drm_de
 	if (map->type == _DRM_SHM)
 		map->size = PAGE_ALIGN(map->size);
 	if ((map->offset & (~(resource_size_t)PAGE_MASK)) || (map->size & (~PAGE_MASK))) {
 		kfree(map);
 		return -EINVAL;
+	}
 	map->mtrr = -1;
 	map->handle = NULL;
 	switch (map->type) {
 	case _DRM_REGISTERS:
 	case _DRM_FRAME_BUFFER:
 #ifndef __NetBSD__		/* XXX No idea what this is for...  */
 #if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) && !defined(__powerpc64__) && !defined(__x86_64__) && !defined(__arm__)
 		if (map->offset + (map->size-1) < map->offset ||
 		    map->offset < virt_to_phys(high_memory)) {
 			kfree(map);
 			return -EINVAL;
+		}
 #endif
 #endif
 		/* Some drivers preinitialize some maps, without the X Server
 		 * needing to be aware of it.  Therefore, we just return success
 		 * when the server tries to create a duplicate map.
 		 */
 		list = drm_find_matching_map(dev, map);
 		if (list != NULL) {
 			if (list->map->size != map->size) {
 				DRM_DEBUG("Matching maps of type %d with "
 					  "mismatched sizes, (%ld vs %ld)\n",
 					  map->type, map->size,
 					  list->map->size);
 				list->map->size = map->size;
+			}

 @@ -2100,31 +2100,46 @@ DRM_READ16(struct drm_local_map *map, bu
 static inline uint32_t
 DRM_READ32(struct drm_local_map *map, bus_size_t offset)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		return bus_space_read_4(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset);
 	else
 		return *(volatile uint32_t *)((vaddr_t)map->handle + offset);
+}
 static inline uint64_t
 DRM_READ64(struct drm_local_map *map, bus_size_t offset)
+{
-	if (DRM_IS_BUS_SPACE(map))
+	if (DRM_IS_BUS_SPACE(map)) {
 #if _LP64			/* XXX How to detect bus_space_read_8?  */
 		return bus_space_read_8(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset);
-	else
+#elif _BYTE_ORDER == _LITTLE_ENDIAN
 		/* XXX Yes, this is sketchy.  */
 		return bus_space_read_4(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset) |
 		    ((uint64_t)bus_space_read_4(map->lm_data.bus_space.bst,
 			map->lm_data.bus_space.bsh, (offset + 4)) << 32);
 #else
 		/* XXX Yes, this is sketchy.  */
 		return bus_space_read_4(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, (offset + 4)) |
 		    ((uint64_t)bus_space_read_4(map->lm_data.bus_space.bst,
 			map->lm_data.bus_space.bsh, offset) << 32);
 #endif
 	} else {
 		return *(volatile uint64_t *)((vaddr_t)map->handle + offset);
+	}
+}
 static inline void
 DRM_WRITE8(struct drm_local_map *map, bus_size_t offset, uint8_t value)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		bus_space_write_1(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset, value);
 	else
 		*(volatile uint8_t *)((vaddr_t)map->handle + offset) = value;
+}
 static inline void
 @@ -2140,31 +2155,45 @@ DRM_WRITE16(struct drm_local_map *map, b
 static inline void
 DRM_WRITE32(struct drm_local_map *map, bus_size_t offset, uint32_t value)
+{
 	if (DRM_IS_BUS_SPACE(map))
 		bus_space_write_4(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset, value);
 	else
 		*(volatile uint32_t *)((vaddr_t)map->handle + offset) = value;
+}
 static inline void
 DRM_WRITE64(struct drm_local_map *map, bus_size_t offset, uint64_t value)
+{
-	if (DRM_IS_BUS_SPACE(map))
+	if (DRM_IS_BUS_SPACE(map)) {
 #if _LP64			/* XXX How to detect bus_space_write_8?  */
 		bus_space_write_8(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset, value);
-	else
+#elif _BYTE_ORDER == _LITTLE_ENDIAN
 		bus_space_write_4(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset, (value & 0xffffffffU));
 		bus_space_write_4(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, (offset + 4), (value >> 32));
 #else
 		bus_space_write_4(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, offset, (value >> 32));
 		bus_space_write_4(map->lm_data.bus_space.bst,
 		    map->lm_data.bus_space.bsh, (offset + 4),
 		    (value & 0xffffffffU));
 #endif
 	} else {
 		*(volatile uint64_t *)((vaddr_t)map->handle + offset) = value;
+	}
+}
 #endif	/* defined(__NetBSD__) */
 #ifdef __NetBSD__
 /* XXX This is pretty kludgerific.  */
 #include <linux/io-mapping.h>
 static inline struct io_mapping *
 drm_io_mapping_create_wc(struct drm_device *dev, resource_size_t addr,
     unsigned long size)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i915_gem_gtt.c,v 1.2 2014/03/18 18:20:42 riastradh Exp $	*/
+/*	$NetBSD: i915_gem_gtt.c,v 1.3 2014/04/03 19:18:29 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 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,27 +20,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: i915_gem_gtt.c,v 1.2 2014/03/18 18:20:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.3 2014/04/03 19:18:29 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/agpvar.h>
 #include <dev/pci/agp_i810var.h>
 #include <drm/drmP.h>
 @@ -81,29 +81,31 @@ i915_gem_gtt_init(struct drm_device *dev
 	else
 		ret = gen6_gtt_init(dev);
 	if (ret)
 		goto fail0;
 	/*
 	 * The GTT entries are limited to 32-bit physical addresses up
 	 * until gen4, at and after which they are limited to 36-bit
 	 * physical addresses.
+	 *
 	 * XXX pci_set_dma_mask?  pci_set_consistent_dma_mask?
 	 */
 	if (INTEL_INFO(dev)->gen < 4)
-		drm_limit_dma_space(dev, 0, 0x00000000ffffffffULL);
+		drm_limit_dma_space(dev, 0,
 		    MIN(__type_max(resource_size_t), 0x00000000ffffffffULL));
 	else
-		drm_limit_dma_space(dev, 0, 0x0000000fffffffffULL);
+		drm_limit_dma_space(dev, 0,
 		    MIN(__type_max(resource_size_t), 0x0000000fffffffffULL));
 	/* Success!  */
 	DRM_INFO("Memory usable by graphics device = %dM\n",
 	    gtt->gtt_total_entries >> 8);
 	DRM_DEBUG_DRIVER("GMADR size = %dM\n", gtt->gtt_mappable_entries >> 8);
 	DRM_DEBUG_DRIVER("GTT stolen size = %dM\n", gtt->stolen_size >> 20);
 	return 0;
 fail1: __unused
 	if (INTEL_INFO(dev)->gen < 6)
 		agp_gtt_fini(dev);
 	else
 		gen6_gtt_fini(dev);
 @@ -497,27 +499,35 @@ agp_ggtt_clear_range(struct drm_device *
 #define	IVB_GMCH_GMS	(IVB_GMCH_GMS_MASK << IVB_GMCH_GMS_SHIFT)
 typedef uint32_t gtt_pte_t;
 #define	GEN6_PTE_VALID		__BIT(0)
 #define	GEN6_PTE_UNCACHED	__BIT(1)
 #define	HSW_PTE_UNCACHED	(0)
 #define	GEN6_PTE_CACHE_LLC	__BIT(2)
 #define	GEN6_PTE_CACHE_LLC_MLC	__BIT(3)
 static uint32_t
 gen6_pte_addr_encode(bus_addr_t addr)
+{
 	/*
 	 * XXX `#ifdef __x86_64__' is a horrible way to work around a
 	 * completely stupid GCC warning that encourages unsafe,
 	 * nonportable code and has no obvious way to be selectively
 	 * suppressed.
 	 */
 #if __x86_64__
 	KASSERT(addr <= __BITS(39, 0));
 #endif
 	return (addr | ((addr >> 28) & 0xff0));
+}
 static gtt_pte_t
 gen6_pte_encode(struct drm_device *dev, bus_addr_t addr,
     enum i915_cache_level level)
+{
 	uint32_t flags = GEN6_PTE_VALID;
 	switch (level) {
 	case I915_CACHE_LLC_MLC:
 		flags |= (IS_HASWELL(dev)? GEN6_PTE_CACHE_LLC
 		    : GEN6_PTE_CACHE_LLC_MLC);
 @@ -575,28 +585,28 @@ gen6_gtt_init(struct drm_device *dev)
 	if (((gtt->gtt_mappable_entries >> 8) < 64) ||
 	    (gtt->gtt_total_entries < gtt->gtt_mappable_entries)) {
 		DRM_ERROR("unknown GMADR entries: %d\n",
 		    gtt->gtt_mappable_entries);
 		ret = -ENXIO;
 		goto fail0;
+	}
 	/* Linux sez:  For GEN6+ the PTEs for the ggtt live at 2MB + BAR0 */
 	if (dev->bus_maps[0].bm_size < (gtt->gtt_total_entries *
 		sizeof(gtt_pte_t))) {
 		DRM_ERROR("BAR0 too small for GTT: 0x%"PRIxMAX" < 0x%"PRIxMAX
 		    "\n",
-		    dev->bus_maps[0].bm_size,
+		    (uintmax_t)dev->bus_maps[0].bm_size,
-		    (gtt->gtt_total_entries * sizeof(gtt_pte_t)));
+		    (uintmax_t)(gtt->gtt_total_entries * sizeof(gtt_pte_t)));
 		ret = -ENODEV;
 		goto fail0;
+	}
 	if (bus_space_map(dev->bst, (dev->bus_maps[0].bm_base + (2<<20)),
 		(gtt->gtt_total_entries * sizeof(gtt_pte_t)),
 ,
 		&gtt->gtt_bsh)) {
 		DRM_ERROR("unable to map GTT\n");
 		ret = -ENODEV;
 		goto fail0;
+	}
 	ret = i915_gem_gtt_init_scratch_page(gtt, dev->dmat);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i915_pci.c,v 1.3 2014/04/03 14:45:44 riastradh Exp $	*/
+/*	$NetBSD: i915_pci.c,v 1.4 2014/04/03 19:18:29 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 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,27 +20,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: i915_pci.c,v 1.3 2014/04/03 14:45:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.4 2014/04/03 19:18:29 riastradh Exp $");
 #include <sys/types.h>
 #ifndef _MODULE
 /* XXX Mega-kludge because modules are broken.  */
 #include <sys/once.h>
 #endif
 #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>
 @@ -412,28 +412,29 @@ i915drm_fb_probe(struct drm_fb_helper *f
 	    &sc->sc_fb_bsh);
 	if (ret) {
 		aprint_error_dev(sc->sc_dev, "unable to map framebuffer: %d\n",
 		    ret);
 		goto fail3;
+	}
 	prop_dictionary_set_bool(dict, "is_console", 1); /* XXX */
 	prop_dictionary_set_uint32(dict, "width", mode_cmd.width);
 	prop_dictionary_set_uint32(dict, "height", mode_cmd.height);
 	prop_dictionary_set_uint8(dict, "depth", sizes->surface_bpp);
 	prop_dictionary_set_uint16(dict, "linebytes", mode_cmd.pitches[0]);
 	prop_dictionary_set_uint32(dict, "address", 0); /* XXX >32-bit */
 	CTASSERT(sizeof(uintptr_t) <= sizeof(uint64_t));
 	prop_dictionary_set_uint64(dict, "virtual_address",
-	    (uint64_t)bus_space_vaddr(dev->bst, sc->sc_fb_bsh));
+	    (uint64_t)(uintptr_t)bus_space_vaddr(dev->bst, sc->sc_fb_bsh));
 	sc->sc_genfb.sc_dev = sc->sc_dev;
 	genfb_init(&sc->sc_genfb);
 	genfb_ops.genfb_ioctl = i915drm_genfb_ioctl;
 	genfb_ops.genfb_mmap = i915drm_genfb_mmap;
 	/* XXX errno NetBSD->Linux */
 	ret = -genfb_attach(&sc->sc_genfb, &genfb_ops);
 	if (ret) {
 		aprint_error_dev(sc->sc_dev, "unable to attach genfb: %d\n",
 		    ret);
 		goto fail4;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_dma_hacks.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $	*/
+/*	$NetBSD: bus_dma_hacks.h,v 1.3 2014/04/03 19:18:29 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 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.
 @@ -42,27 +42,36 @@
 static inline int
 bus_dmamem_wire_uvm_object(bus_dma_tag_t tag, struct uvm_object *uobj,
     off_t start, bus_size_t size, struct pglist *pages, bus_size_t alignment,
     bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs,
     int flags)
+{
 	struct pglist pageq;
 	struct vm_page *page;
 	bus_addr_t prev_addr, addr;
 	unsigned int i;
 	int error;
 	/*
 	 * XXX `#ifdef __x86_64__' is a horrible way to work around a
 	 * completely stupid GCC warning that encourages unsafe,
 	 * nonportable code and has no obvious way to be selectively
 	 * suppressed.
 	 */
 #if __x86_64__
 	KASSERT(size <= __type_max(off_t));
 #endif
 	KASSERT(start <= (__type_max(off_t) - size));
 	KASSERT(alignment == PAGE_SIZE); /* XXX */
 	KASSERT(0 < nsegs);
 	if (pages == NULL) {
 		TAILQ_INIT(&pageq);
 		pages = &pageq;
+	}
 	error = uvm_obj_wirepages(uobj, start, (start + size), pages);
 	if (error)
 		goto fail0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $	*/
+/*	$NetBSD: pci.h,v 1.3 2014/04/03 19:18:29 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 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,26 +24,27 @@
  * 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.
  */
 #ifndef _LINUX_PCI_H_
 #define _LINUX_PCI_H_
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <sys/cdefs.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <linux/ioport.h>
 struct pci_bus;
 struct pci_device_id {
 	uint32_t	vendor;
 @@ -241,27 +242,27 @@ pci_bus_alloc_resource(struct pci_bus *b
 	case IORESOURCE_MEM:
 		bst = pa->pa_memt;
 		break;
 	case IORESOURCE_IO:
 		bst = pa->pa_iot;
 		break;
 	default:
 		panic("I don't know what kind of resource you want!");
+	}
 	resource->r_bst = bst;
-	error = bus_space_alloc(bst, start, 0xffffffffffffffffULL /* XXX */,
+	error = bus_space_alloc(bst, start, __type_max(bus_addr_t),
 	    size, align, 0, 0, &resource->start, &resource->r_bsh);
 	if (error)
 		return error;
 	resource->size = size;
 	return 0;
+}
 /*
  * XXX Mega-kludgerific!  pci_get_bus_and_slot and pci_get_class are
  * defined only for their single purposes in i915drm, in
  * i915_get_bridge_dev and intel_detect_pch.  We can't define them more
  * generally without adapting pci_find_device (and pci_enumerate_bus