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

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

details:   https://anonhg.NetBSD.org/src/rev/fd3b6f8a5bb4
branches:  trunk
changeset: 343549:fd3b6f8a5bb4
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Feb 14 03:41:18 2016 +0000

description:
Map the same mmio size as Linux does.

Unlikely to have practical consequences -- just reduces differences
in behaviour from upstream, to rule them out.

diffstat:

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

diffs (36 lines):

diff -r 47f3e7139f19 -r fd3b6f8a5bb4 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    Sun Feb 14 03:06:06 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c    Sun Feb 14 03:41:18 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_engine_device_base.c,v 1.8 2015/11/05 20:32:39 riastradh Exp $ */
+/*     $NetBSD: nouveau_engine_device_base.c,v 1.9 2016/02/14 03:41:18 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.8 2015/11/05 20:32:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_device_base.c,v 1.9 2016/02/14 03:41:18 riastradh Exp $");
 
 #include <core/object.h>
 #include <core/device.h>
@@ -180,7 +180,7 @@
                if (mmio_size < 0x102000)
                        return -ENOMEM;
                /* XXX errno NetBSD->Linux */
-               ret = -bus_space_map(mmiot, mmio_base, mmio_size, 0, &mmioh);
+               ret = -bus_space_map(mmiot, mmio_base, 0x102000, 0, &mmioh);
                if (ret)
                        return ret;
 
@@ -193,7 +193,7 @@
 
                boot0 = bus_space_read_4(mmiot, mmioh, 0x000000);
                strap = bus_space_read_4(mmiot, mmioh, 0x101000);
-               bus_space_unmap(mmiot, mmioh, mmio_size);
+               bus_space_unmap(mmiot, mmioh, 0x102000);
 #else
                map = ioremap(mmio_base, 0x102000);
                if (map == NULL)