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

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

details:   https://anonhg.NetBSD.org/src/rev/a69634f7e722
branches:  trunk
changeset: 344733:a69634f7e722
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Apr 13 08:50:51 2016 +0000

description:
Exclude VRAM and FIFO regions from MMIO register mapping.

Nouveau maps those separately, and it is not trivial to convert those
mappings to bus_space_subregion.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r ed71c59fdb37 -r a69634f7e722 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c    Wed Apr 13 08:43:56 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c    Wed Apr 13 08:50:51 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_engine_device_base.c,v 1.9 2016/02/14 03:41:18 riastradh Exp $ */
+/*     $NetBSD: nouveau_engine_device_base.c,v 1.10 2016/04/13 08:50:51 riastradh Exp $        */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_device_base.c,v 1.9 2016/02/14 03:41:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_device_base.c,v 1.10 2016/04/13 08:50:51 riastradh Exp $");
 
 #include <core/object.h>
 #include <core/device.h>
@@ -297,6 +297,12 @@
 #ifdef __NetBSD__
        if (!(args->disable & NV_DEVICE_DISABLE_MMIO) &&
            !nv_subdev(device)->mmiosz) {
+               /*
+                * Map only through PRAMIN -- don't map the command
+                * FIFO MMIO regions, which start at NV_FIFO_OFFSET =
+                * 0x800000 and are mapped separately.
+                */
+               mmio_size = MIN(mmio_size, 0x800000);
                /* XXX errno NetBSD->Linux */
                ret = -bus_space_map(mmiot, mmio_base, mmio_size, 0, &mmioh);
                if (ret) {