Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:45:43 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_phys.c
Log Message:
i915: Use BUS_DMA_COHERENT where Linux uses dma_alloc_coherent.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_phys.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/i915/gem/i915_gem_phys.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_phys.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_phys.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_phys.c:1.7 Sun Dec 19 12:10:42 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_phys.c Sun Dec 19 12:45:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_phys.c,v 1.7 2021/12/19 12:10:42 riastradh Exp $ */
+/* $NetBSD: i915_gem_phys.c,v 1.8 2021/12/19 12:45:43 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_phys.c,v 1.7 2021/12/19 12:10:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_phys.c,v 1.8 2021/12/19 12:45:43 riastradh Exp $");
#include <linux/highmem.h>
#include <linux/shmem_fs.h>
@@ -66,7 +66,8 @@ static int i915_gem_object_get_pages_phy
return -ENOMEM;
KASSERT(rsegs == 1);
ret = -bus_dmamem_map(dmat, &obj->mm.u.phys.seg, 1,
- roundup_pow_of_two(obj->base.size), &vaddr, BUS_DMA_WAITOK);
+ roundup_pow_of_two(obj->base.size), &vaddr,
+ BUS_DMA_WAITOK|BUS_DMA_COHERENT);
if (ret)
goto err_pci;
obj->mm.u.phys.kva = vaddr;
