diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-12-15 11:17:37 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-12-15 11:17:37 +0000 |
| commit | 0bcc6a43ae8f7a3aed5dd41e156c202c02fdd006 (patch) | |
| tree | 737d9d53e639756c876038faee0701515bf40467 /sys/dev/pci | |
| parent | af86f5e69cca2184cf28803ef9197c7d6650c69a (diff) | |
Abuse phys_map to reliably wait for kva.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_gem_tiling.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/i915/i915_gem_tiling.c b/sys/dev/pci/drm/i915/i915_gem_tiling.c index 3681bbdf246..ba885872c2a 100644 --- a/sys/dev/pci/drm/i915/i915_gem_tiling.c +++ b/sys/dev/pci/drm/i915/i915_gem_tiling.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_gem_tiling.c,v 1.11 2013/12/11 20:31:43 kettenis Exp $ */ +/* $OpenBSD: i915_gem_tiling.c,v 1.12 2013/12/15 11:17:36 kettenis Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -485,7 +485,7 @@ i915_gem_swizzle_page(struct vm_page *pg) #if defined (__HAVE_PMAP_DIRECT) va = pmap_map_direct(pg); #else - va = uvm_km_valloc_wait(kernel_map, PAGE_SIZE); + va = uvm_km_valloc_wait(phys_map, PAGE_SIZE); pmap_kenter_pa(va, VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE); pmap_update(pmap_kernel()); #endif @@ -502,7 +502,7 @@ i915_gem_swizzle_page(struct vm_page *pg) #else pmap_kremove(va, PAGE_SIZE); pmap_update(pmap_kernel()); - uvm_km_free(kernel_map, va, PAGE_SIZE); + uvm_km_free_wakeup(phys_map, va, PAGE_SIZE); #endif } |