[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau Add missing BUS_DMA_C...

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

details:   https://anonhg.NetBSD.org/src/rev/0a5756d50d99
branches:  trunk
changeset: 930994:0a5756d50d99
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Apr 19 19:12:37 2020 +0000

description:
Add missing BUS_DMA_COHERENT hints

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c                         |  6 +++---
 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mmu/nouveau_nvkm_subdev_mmu_nv44.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r d24a715d7f88 -r 0a5756d50d99 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c     Sun Apr 19 18:47:40 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c     Sun Apr 19 19:12:37 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nv50_display.c,v 1.11 2020/02/14 14:34:58 maya Exp $   */
+/*     $NetBSD: nouveau_nv50_display.c,v 1.12 2020/04/19 19:12:37 jmcneill Exp $       */
 
 /*
  * Copyright 2011 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nv50_display.c,v 1.11 2020/02/14 14:34:58 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nv50_display.c,v 1.12 2020/04/19 19:12:37 jmcneill Exp $");
 
 #include <linux/dma-mapping.h>
 
@@ -297,7 +297,7 @@
        }
        /* XXX errno NetBSD->Linux */
        ret = -bus_dmamem_map(dmat, &dmac->dmaseg, 1, PAGE_SIZE, &dmac->dmakva,
-           BUS_DMA_WAITOK);
+           BUS_DMA_WAITOK | BUS_DMA_COHERENT);
        if (ret) {
                bus_dmamap_destroy(dmat, dmac->dmamap);
                bus_dmamem_free(dmat, &dmac->dmaseg, 1);
diff -r d24a715d7f88 -r 0a5756d50d99 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mmu/nouveau_nvkm_subdev_mmu_nv44.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mmu/nouveau_nvkm_subdev_mmu_nv44.c     Sun Apr 19 18:47:40 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mmu/nouveau_nvkm_subdev_mmu_nv44.c     Sun Apr 19 19:12:37 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_subdev_mmu_nv44.c,v 1.3 2018/08/27 07:41:09 riastradh Exp $       */
+/*     $NetBSD: nouveau_nvkm_subdev_mmu_nv44.c,v 1.4 2020/04/19 19:12:37 jmcneill Exp $        */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_mmu_nv44.c,v 1.3 2018/08/27 07:41:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_mmu_nv44.c,v 1.4 2020/04/19 19:12:37 jmcneill Exp $");
 
 #include "nv04.h"
 
@@ -193,7 +193,7 @@
 
        /* XXX errno NetBSD->Linux */
        ret = -bus_dmamem_map(dmat, &mmu->nullseg, 1, nullsz,
-           &mmu->nullp, BUS_DMA_WAITOK);
+           &mmu->nullp, BUS_DMA_WAITOK | BUS_DMA_COHERENT);
        if (ret) {
 fail2:         bus_dmamap_destroy(dmat, mmu->nullmap);
                goto fail1;