Module Name: src
Committed By: riastradh
Date: Wed Jul 20 01:12:14 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c
Log Message:
drm/ttm: Handle io_mem_pfn, used by amdgpu.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.20 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.21
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.20 Sun Dec 19 11:34:14 2021
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Wed Jul 20 01:12:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.20 2021/12/19 11:34:14 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.21 2022/07/20 01:12:14 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.20 2021/12/19 11:34:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.21 2022/07/20 01:12:14 riastradh Exp $");
#include <sys/types.h>
@@ -192,14 +192,17 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
/* XXX PGO_ALLPAGES? */
if (pps[i] == PGO_DONTCARE)
continue;
- if (bo->mem.bus.is_iomem) {
+ if (!bo->mem.bus.is_iomem) {
+ paddr = page_to_phys(u.ttm->pages[startpage + i]);
+ } else if (bdev->driver->io_mem_pfn) {
+ paddr = (*bdev->driver->io_mem_pfn)(bo, startpage + i)
+ << PAGE_SHIFT;
+ } else {
const paddr_t cookie = bus_space_mmap(bdev->memt,
u.base, ((startpage + i) << PAGE_SHIFT), vm_prot,
0);
paddr = pmap_phys_address(cookie);
- } else {
- paddr = page_to_phys(u.ttm->pages[startpage + i]);
}
ret = -pmap_enter(ufi->orig_map->pmap, vaddr + i*PAGE_SIZE,
paddr, vm_prot, (PMAP_CANFAIL | pgprot));
