 @@ -1,41 +1,41 @@
-/*	$NetBSD: nouveau_nv50_display.c,v 1.3 2015/02/25 14:57:04 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nv50_display.c,v 1.4 2015/10/14 00:12:55 mrg Exp $	*/
 	/*
  * Copyright 2011 Red Hat Inc.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nv50_display.c,v 1.3 2015/02/25 14:57:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nv50_display.c,v 1.4 2015/10/14 00:12:55 mrg Exp $");
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include "nouveau_drm.h"
 #include "nouveau_dma.h"
 #include "nouveau_gem.h"
 #include "nouveau_connector.h"
 #include "nouveau_encoder.h"
 #include "nouveau_crtc.h"
 @@ -174,28 +174,28 @@ struct nv50_dmac {
 	/* Protects against concurrent pushbuf access to this channel, lock is
 	 * grabbed by evo_wait (if the pushbuf reservation is successful) and
 	 * dropped again by evo_kick. */
 	struct mutex lock;
 };
 static void
 nv50_dmac_destroy(struct nouveau_object *core, struct nv50_dmac *dmac)
+{
 	if (dmac->ptr) {
 		struct pci_dev *pdev = nv_device(core)->pdev;
 #ifdef __NetBSD__
-		/* XXX pa_dmat or pa_dmat64? */
+		const bus_dma_tag_t dmat = pci_dma64_available(&pdev->pd_pa) ?
-		const bus_dma_tag_t dmat = pdev->pd_pa.pa_dmat64;
+		    pdev->pd_pa.pa_dmat64 : pdev->pd_pa.pa_dmat;
 		bus_dmamap_unload(dmat, dmac->dmamap);
 		bus_dmamem_unmap(dmat, dmac->dmakva, PAGE_SIZE);
 		bus_dmamap_destroy(dmat, dmac->dmamap);
 		bus_dmamem_free(dmat, &dmac->dmaseg, 1);
 		dmac->handle = 0;
 		dmac->ptr = NULL;
 #else
 		pci_free_consistent(pdev, PAGE_SIZE, dmac->ptr, dmac->handle);
 #endif
+	}
 #ifdef __NetBSD__
 @@ -333,27 +333,30 @@ nv50_dmac_create(struct nouveau_object *
 	struct nouveau_object *client = nv_pclass(core, NV_CLIENT_CLASS);
 	struct nouveau_object *object;
 	u32 pushbuf = *(u32 *)data;
 	int ret;
 #ifdef __NetBSD__
 	linux_mutex_init(&dmac->lock);
 #else
 	mutex_init(&dmac->lock);
 #endif
 #ifdef __NetBSD__
+    {
-	const bus_dma_tag_t dmat = nv_device(core)->pdev->pd_pa.pa_dmat64;
+	struct nouveau_device *device = nv_device(core);
 	const bus_dma_tag_t dmat = pci_dma64_available(&device->pdev->pd_pa) ?
 	    device->pdev->pd_pa.pa_dmat64 : device->pdev->pd_pa.pa_dmat;
 	int rsegs;
 	/* XXX errno NetBSD->Linux */
 	ret = -bus_dmamem_alloc(dmat, PAGE_SIZE, PAGE_SIZE, 0, &dmac->dmaseg,
 , &rsegs, BUS_DMA_WAITOK);
 	if (ret)
 		return ret;
 	KASSERT(rsegs == 1);
 	/* XXX errno NetBSD->Linux */
 	ret = -bus_dmamap_create(dmat, PAGE_SIZE, 1, PAGE_SIZE, 0,
 	    BUS_DMA_WAITOK, &dmac->dmamap);
 	if (ret) {
 		bus_dmamem_free(dmat, &dmac->dmaseg, 1);

 @@ -1,41 +1,41 @@
-/*	$NetBSD: nouveau_subdev_fb_nv50.c,v 1.2 2015/02/25 17:29:43 riastradh Exp $	*/
+/*	$NetBSD: nouveau_subdev_fb_nv50.c,v 1.3 2015/10/14 00:12:55 mrg Exp $	*/
 /*
  * Copyright 2012 Red Hat Inc.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_fb_nv50.c,v 1.2 2015/02/25 17:29:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_fb_nv50.c,v 1.3 2015/10/14 00:12:55 mrg Exp $");
 #include <core/client.h>
 #include <core/enum.h>
 #include <core/engctx.h>
 #include <core/object.h>
 #include <subdev/bios.h>
 #include "nv50.h"
 int
 nv50_fb_memtype[0x80] = {
 , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 @@ -245,28 +245,28 @@ nv50_fb_ctor(struct nouveau_object *pare
 	     struct nouveau_object **pobject)
+{
 	struct nouveau_device *device = nv_device(parent);
 	struct nv50_fb_priv *priv;
 	int ret;
 	ret = nouveau_fb_create(parent, engine, oclass, &priv);
 	*pobject = nv_object(priv);
 	if (ret)
 		return ret;
 #ifdef __NetBSD__
+    {
-	/* XXX pa_dmat or pa_dmat64?  */
+	const bus_dma_tag_t dmat = pci_dma64_available(&device->pdev->pd_pa) ?
-	const bus_dma_tag_t dmat = device->pdev->pd_pa.pa_dmat64;
+	    device->pdev->pd_pa.pa_dmat64 : device->pdev->pd_pa.pa_dmat;
 	int nsegs;
 	priv->r100c08_map = NULL; /* paranoia */
 	priv->r100c08_kva = NULL;
 	/* XXX errno NetBSD->Linux */
 	ret = -bus_dmamem_alloc(dmat, PAGE_SIZE, PAGE_SIZE, 0,
 	    &priv->r100c08_seg, 1, &nsegs, BUS_DMA_WAITOK);
 	if (ret) {
 fail0:		nouveau_fb_destroy(&priv->base);
 		return ret;
+	}
 	KASSERT(nsegs == 1);
 @@ -311,27 +311,28 @@ fail3: __unused	bus_dmamem_unmap(dmat, p
 	nv_subdev(priv)->intr = nv50_fb_intr;
 	return 0;
+}
 void
 nv50_fb_dtor(struct nouveau_object *object)
+{
 	struct nouveau_device *device = nv_device(object);
 	struct nv50_fb_priv *priv = (void *)object;
 #ifdef __NetBSD__
 	if (priv->r100c08_map) {
-		const bus_dma_tag_t dmat = device->pdev->pd_pa.pa_dmat64;
+		const bus_dma_tag_t dmat = pci_dma64_available(&device->pdev->pd_pa) ?
 		    device->pdev->pd_pa.pa_dmat64 : device->pdev->pd_pa.pa_dmat;
 		bus_dmamap_unload(dmat, priv->r100c08_map);
 		bus_dmamem_unmap(dmat, priv->r100c08_kva, PAGE_SIZE);
 		bus_dmamap_destroy(dmat, priv->r100c08_map);
 		bus_dmamem_free(dmat, &priv->r100c08_seg, 1);
+	}
 #else
 	if (priv->r100c08_page) {
 		nv_device_unmap_page(device, priv->r100c08);
 		__free_page(priv->r100c08_page);
+	}
 #endif

 @@ -1,41 +1,41 @@
-/*	$NetBSD: nouveau_subdev_fb_nvc0.c,v 1.2 2015/02/25 17:29:43 riastradh Exp $	*/
+/*	$NetBSD: nouveau_subdev_fb_nvc0.c,v 1.3 2015/10/14 00:12:55 mrg Exp $	*/
 /*
  * Copyright 2012 Red Hat Inc.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_fb_nvc0.c,v 1.2 2015/02/25 17:29:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_fb_nvc0.c,v 1.3 2015/10/14 00:12:55 mrg Exp $");
 #include "nvc0.h"
 extern const u8 nvc0_pte_storage_type_map[256];
 bool
 nvc0_fb_memtype_valid(struct nouveau_fb *pfb, u32 tile_flags)
+{
 	u8 memtype = (tile_flags & 0x0000ff00) >> 8;
 	return likely((nvc0_pte_storage_type_map[memtype] != 0xff));
+}
 static void
 @@ -71,27 +71,28 @@ nvc0_fb_init(struct nouveau_object *obje
 		nv_wr32(priv, 0x100c10, priv->r100c10 >> 8);
 #endif
 	return 0;
+}
 void
 nvc0_fb_dtor(struct nouveau_object *object)
+{
 	struct nouveau_device *device = nv_device(object);
 	struct nvc0_fb_priv *priv = (void *)object;
 #ifdef __NetBSD__
 	if (priv->r100c10_map) {
-		const bus_dma_tag_t dmat = device->pdev->pd_pa.pa_dmat64;
+		const bus_dma_tag_t dmat = pci_dma64_available(&device->pdev->pd_pa) ?
 		    device->pdev->pd_pa.pa_dmat64 : device->pdev->pd_pa.pa_dmat;
 		bus_dmamap_unload(dmat, priv->r100c10_map);
 		bus_dmamem_unmap(dmat, priv->r100c10_kva, PAGE_SIZE);
 		bus_dmamap_destroy(dmat, priv->r100c10_map);
 		bus_dmamem_free(dmat, &priv->r100c10_seg, 1);
+	}
 #else
 	if (priv->r100c10_page) {
 		nv_device_unmap_page(device, priv->r100c10);
 		__free_page(priv->r100c10_page);
+	}
 #endif
 @@ -104,28 +105,28 @@ nvc0_fb_ctor(struct nouveau_object *pare
 	     struct nouveau_object **pobject)
+{
 	struct nouveau_device *device = nv_device(parent);
 	struct nvc0_fb_priv *priv;
 	int ret;
 	ret = nouveau_fb_create(parent, engine, oclass, &priv);
 	*pobject = nv_object(priv);
 	if (ret)
 		return ret;
 #ifdef __NetBSD__
+    {
-	/* XXX pa_dmat or pa_dmat64?  */
+	const bus_dma_tag_t dmat = pci_dma64_available(&device->pdev->pd_pa) ?
-	const bus_dma_tag_t dmat = device->pdev->pd_pa.pa_dmat64;
+	    device->pdev->pd_pa.pa_dmat64 : device->pdev->pd_pa.pa_dmat;
 	int nsegs;
 	priv->r100c10_map = NULL; /* paranoia */
 	priv->r100c10_kva = NULL;
 	/* XXX errno NetBSD->Linux */
 	ret = -bus_dmamem_alloc(dmat, PAGE_SIZE, PAGE_SIZE, 0,
 	    &priv->r100c10_seg, 1, &nsegs, BUS_DMA_WAITOK);
 	if (ret) {
 fail0:		nouveau_fb_destroy(&priv->base);
 		return ret;
+	}
 	KASSERT(nsegs == 1);

 @@ -1,41 +1,41 @@
-/*	$NetBSD: nouveau_subdev_vm_nv04.c,v 1.2 2015/02/25 22:12:00 riastradh Exp $	*/
+/*	$NetBSD: nouveau_subdev_vm_nv04.c,v 1.3 2015/10/14 00:12:55 mrg Exp $	*/
 /*
  * Copyright 2012 Red Hat Inc.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_vm_nv04.c,v 1.2 2015/02/25 22:12:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_vm_nv04.c,v 1.3 2015/10/14 00:12:55 mrg Exp $");
 #include <core/gpuobj.h>
 #include "nv04.h"
 #define NV04_PDMA_SIZE (128 * 1024 * 1024)
 #define NV04_PDMA_PAGE (  4 * 1024)
 /*******************************************************************************
  * VM map/unmap callbacks
  ******************************************************************************/
 static void
 @@ -129,29 +129,29 @@ nv04_vmmgr_ctor(struct nouveau_object *p
 	return 0;
+}
 void
 nv04_vmmgr_dtor(struct nouveau_object *object)
+{
 	struct nv04_vmmgr_priv *priv = (void *)object;
 	if (priv->vm) {
 		nouveau_gpuobj_ref(NULL, &priv->vm->pgt[0].obj[0]);
 		nouveau_vm_ref(NULL, &priv->vm, NULL);
+	}
 #ifdef __NetBSD__
 	if (priv->nullp) {
 		/* XXX pa_dmat or pa_dmat64?  */
 		struct nouveau_device *device = nv_device(priv);
-		const bus_dma_tag_t dmat = device->pdev->pd_pa.pa_dmat64;
+		const bus_dma_tag_t dmat = pci_dma64_available(&device->pdev->pd_pa) ?
 		    device->pdev->pd_pa.pa_dmat64 : device->pdev->pd_pa.pa_dmat;
 		bus_dmamap_unload(dmat, priv->nullmap);
 		bus_dmamem_unmap(dmat, priv->nullp, PAGE_SIZE);
 		bus_dmamap_destroy(dmat, priv->nullmap);
 		bus_dmamem_free(dmat, &priv->nullseg, 1);
+	}
 #else
 	if (priv->nullp) {
 		pci_free_consistent(nv_device(priv)->pdev, 16 * 1024,
 				    priv->nullp, priv->null);
+	}
 #endif
 	nouveau_vmmgr_destroy(&priv->base);

 @@ -1,41 +1,41 @@
-/*	$NetBSD: nouveau_subdev_vm_nv44.c,v 1.2 2015/02/25 22:12:00 riastradh Exp $	*/
+/*	$NetBSD: nouveau_subdev_vm_nv44.c,v 1.3 2015/10/14 00:12:55 mrg Exp $	*/
 /*
  * Copyright 2012 Red Hat Inc.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_vm_nv44.c,v 1.2 2015/02/25 22:12:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_subdev_vm_nv44.c,v 1.3 2015/10/14 00:12:55 mrg Exp $");
 #include <core/gpuobj.h>
 #include <core/option.h>
 #include <subdev/timer.h>
 #include <subdev/vm.h>
 #include "nv04.h"
 #define NV44_GART_SIZE (512 * 1024 * 1024)
 #define NV44_GART_PAGE (  4 * 1024)
 /*******************************************************************************
 @@ -182,28 +182,28 @@ nv44_vmmgr_ctor(struct nouveau_object *p
 	priv->base.create = nv04_vm_create;
 	priv->base.limit = NV44_GART_SIZE;
 	priv->base.dma_bits = 39;
 	priv->base.pgt_bits = 32 - 12;
 	priv->base.spg_shift = 12;
 	priv->base.lpg_shift = 12;
 	priv->base.map_sg = nv44_vm_map_sg;
 	priv->base.unmap = nv44_vm_unmap;
 	priv->base.flush = nv44_vm_flush;
 #ifdef __NetBSD__
+    {
-	/* XXX pa_dmat or pa_dmat64?  */
+	const bus_dma_tag_t dmat = pci_dma64_available(&device->pdev->pd_pa) ?
-	const bus_dma_tag_t dmat = device->pdev->pd_pa.pa_dmat64;
+	    device->pdev->pd_pa.pa_dmat64 : device->pdev->pd_pa.pa_dmat;
 	int nsegs;
 	/* XXX errno NetBSD->Linux */
 	ret = -bus_dmamem_alloc(dmat, PAGE_SIZE, PAGE_SIZE, 0,
 	    &priv->nullseg, 1, &nsegs, BUS_DMA_WAITOK);
 	if (ret) {
 		/* XXX Need to destroy stuff...  */
 fail0:		nv_error(priv, "unable to allocate dummy pages\n");
 		return ret;
+	}
 	KASSERT(nsegs == 1);
 	/* XXX errno NetBSD->Linux */