 @@ -1,40 +1,40 @@
-/*	$NetBSD: nouveau_nvkm_engine_fifo_chan.c,v 1.6 2018/08/27 14:51:33 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_engine_fifo_chan.c,v 1.7 2018/08/27 14:51:55 riastradh 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_nvkm_engine_fifo_chan.c,v 1.6 2018/08/27 14:51:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_fifo_chan.c,v 1.7 2018/08/27 14:51:55 riastradh Exp $");
 #include "chan.h"
 #include <core/client.h>
 #include <core/gpuobj.h>
 #include <core/oproxy.h>
 #include <subdev/mmu.h>
 #include <engine/dma.h>
 struct nvkm_fifo_chan_object {
 	struct nvkm_oproxy oproxy;
 	struct nvkm_fifo_chan *chan;
 	int hash;
 @@ -323,27 +323,27 @@ nvkm_fifo_chan_wr32(struct nvkm_object *
 	int ret = nvkm_fifo_chan_ensure_mapped(chan);
 	if (ret)
 		return ret;
 #else
 	if (unlikely(!chan->user)) {
 		chan->user = ioremap(chan->addr, chan->size);
 		if (!chan->user)
 			return -ENOMEM;
+	}
 #endif
 	if (unlikely(addr + 4 > chan->size))
 		return -EINVAL;
 #ifdef __NetBSD__
-	bus_space_write_4(chan->bst, chan->bsh, addr, data);
+	bus_space_write_stream_4(chan->bst, chan->bsh, addr, data);
 #else
 	iowrite32_native(data, chan->user + addr);
 #endif
 	return 0;
+}
 static int
 nvkm_fifo_chan_fini(struct nvkm_object *object, bool suspend)
+{
 	struct nvkm_fifo_chan *chan = nvkm_fifo_chan(object);
 	chan->func->fini(chan);
 	return 0;
+}

 @@ -1,40 +1,40 @@
-/*	$NetBSD: nouveau_nvkm_subdev_instmem_nv40.c,v 1.4 2018/08/27 14:51:33 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_subdev_instmem_nv40.c,v 1.5 2018/08/27 14:51:55 riastradh 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_nvkm_subdev_instmem_nv40.c,v 1.4 2018/08/27 14:51:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_instmem_nv40.c,v 1.5 2018/08/27 14:51:55 riastradh Exp $");
 #define nv40_instmem(p) container_of((p), struct nv40_instmem, base)
 #include "priv.h"
 #include <core/memory.h>
 #include <core/ramht.h>
 #include <engine/gr/nv40.h>
 #ifdef __NetBSD__
 #  define	__iomem	__nvkm_memory_iomem
 #endif
 struct nv40_instmem {
 @@ -158,38 +158,38 @@ nv40_instobj_new(struct nvkm_instmem *ba
 	mutex_unlock(&imem->base.subdev.mutex);
 	return ret;
+}
 /******************************************************************************
  * instmem subdev implementation
  *****************************************************************************/
 static u32
 nv40_instmem_rd32(struct nvkm_instmem *base, u32 addr)
+{
 #ifdef __NetBSD__
 	struct nv40_instmem *imem = nv40_instmem(base);
-	return bus_space_read_4(imem->iomemt, imem->iomemh, addr);
+	return bus_space_read_stream_4(imem->iomemt, imem->iomemh, addr);
 #else
 	return ioread32_native(nv40_instmem(base)->iomem + addr);
 #endif
+}
 static void
 nv40_instmem_wr32(struct nvkm_instmem *base, u32 addr, u32 data)
+{
 #ifdef __NetBSD__
 	struct nv40_instmem *imem = nv40_instmem(base);
-	bus_space_write_4(imem->iomemt, imem->iomemh, addr, data);
+	bus_space_write_stream_4(imem->iomemt, imem->iomemh, addr, data);
 #else
 	iowrite32_native(data, nv40_instmem(base)->iomem + addr);
 #endif
+}
 static int
 nv40_instmem_oneinit(struct nvkm_instmem *base)
+{
 	struct nv40_instmem *imem = nv40_instmem(base);
 	struct nvkm_device *device = imem->base.subdev.device;
 	int ret, vs;
 	/* PRAMIN aperture maps over the end of vram, reserve enough space