[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device Fi...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d72ea2986b7d
branches:  trunk
changeset: 364509:d72ea2986b7d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:39:33 2018 +0000

description:
Fix typos.  Use BUS_SPACE_MAP_LINEAR for vaddr later.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 2c9e8bdee31d -r d72ea2986b7d sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c       Mon Aug 27 07:39:20 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c       Mon Aug 27 07:39:33 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.4 2018/08/27 07:39:20 riastradh Exp $    */
+/*     $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.5 2018/08/27 07:39:33 riastradh Exp $    */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.4 2018/08/27 07:39:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.5 2018/08/27 07:39:33 riastradh Exp $");
 
 #include "priv.h"
 #include "acpi.h"
@@ -2562,14 +2562,15 @@
        if (mmio) {
 #ifdef __NetBSD__
                /* XXX errno NetBSD->Linux */
-               ret = -bus_space_map(mmiot, mmio_base, mmio_size, 0, &mmioh);
+               ret = -bus_space_map(mmiot, mmio_base, mmio_size,
+                   BUS_SPACE_MAP_LINEAR, &mmioh);
                if (ret) {
                        nvdev_error(device, "unable to map device registers\n");
                        goto done; /* XXX Linux leaks mutex */
                }
                device->mmiot = mmiot;
                device->mmioh = mmioh;
-               device->mmiosz = mmiosz;
+               device->mmiosz = mmio_size;
 #else
                device->pri = ioremap(mmio_base, mmio_size);
                if (!device->pri) {