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

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

details:   https://anonhg.NetBSD.org/src/rev/97a78c998ae8
branches:  trunk
changeset: 835140:97a78c998ae8
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:42:46 2018 +0000

description:
Guess the right cpu_coherent setting.

diffstat:

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

diffs (34 lines):

diff -r f86ae45965d5 -r 97a78c998ae8 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c        Mon Aug 27 07:42:35 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c        Mon Aug 27 07:42:46 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.5 2018/08/27 07:42:35 riastradh Exp $     */
+/*     $NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.6 2018/08/27 07:42:46 riastradh Exp $     */
 
 /*
  * Copyright 2015 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs <bskeggs%redhat.com@localhost>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.5 2018/08/27 07:42:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.6 2018/08/27 07:42:46 riastradh Exp $");
 
 #include <core/pci.h>
 #include "priv.h"
@@ -1650,7 +1650,15 @@
 #endif
        .resource_addr = nvkm_device_pci_resource_addr,
        .resource_size = nvkm_device_pci_resource_size,
+#ifdef __NetBSD__
+#  ifdef __arm__
+       .cpu_coherent = false,
+#  else
+       .cpu_coherent = true,
+#  endif
+#else
        .cpu_coherent = !IS_ENABLED(CONFIG_ARM),
+#endif
 };
 
 int