Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing BUS_DMA_COHERENT hints

Browse Source
This commit is contained in:
jmcneill 2020-04-19 19:12:37 +00:00
parent 8d1b88592a
commit 46a2b094b1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c vendored
View File

@ -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 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp,
}
/* 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);

6
sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mmu/nouveau_nvkm_subdev_mmu_nv44.c vendored
View File

@ -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 @@ fail1: bus_dmamem_free(dmat, &mmu->nullseg, 1);
/* 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;