Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:37:38 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_ttm.c
Log Message:
Add needful includes and fix device resource addr/size API.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.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/nouveau_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.c:1.5 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.c:1.5 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.c Mon Aug 27 07:37:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_ttm.c,v 1.5 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: nouveau_ttm.c,v 1.6 2018/08/27 07:37:38 riastradh Exp $ */
/*
* Copyright (c) 2007-2008 Tungsten Graphics, Inc., Cedar Park, TX., USA,
@@ -27,7 +27,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_ttm.c,v 1.5 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_ttm.c,v 1.6 2018/08/27 07:37:38 riastradh Exp $");
+
+#include <sys/param.h>
+#include <uvm/uvm_extern.h> /* pmap_pv_track/untrack */
#include "nouveau_drm.h"
#include "nouveau_ttm.h"
@@ -451,8 +454,8 @@ nouveau_ttm_init(struct nouveau_drm *drm
device->func->resource_size(device, 1));
#ifdef __NetBSD__
- pmap_pv_track(nv_device_resource_start(device, 1),
- nv_device_resource_len(device, 1));
+ pmap_pv_track(device->func->resource_addr(device, 1),
+ device->func->resource_size(device, 1));
#endif
/* GART init */
@@ -488,7 +491,8 @@ nouveau_ttm_fini(struct nouveau_drm *drm
drm->ttm.mtrr = 0;
#ifdef __NetBSD__
- pmap_pv_untrack(nv_device_resource_start(nv_device(drm->device), 1),
- nv_device_resource_len(nv_device(drm->device), 1));
+ struct nvkm_device *device = nvxx_device(&drm->device);
+ pmap_pv_untrack(device->func->resource_addr(device, 1),
+ device->func->resource_size(device, 1));
#endif
}
