Module Name: src
Committed By: riastradh
Date: Sun Feb 14 03:41:18 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device:
nouveau_engine_device_base.c
Log Message:
Map the same mmio size as Linux does.
Unlikely to have practical consequences -- just reduces differences
in behaviour from upstream, to rule them out.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c:1.8 src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c:1.8 Thu Nov 5 20:32:39 2015
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c Sun Feb 14 03:41:18 2016
@@ -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 @@ nouveau_devobj_ctor(struct nouveau_objec
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 @@ nouveau_devobj_ctor(struct nouveau_objec
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)
