Use the ci_inatomic flag here as well to "disable" page faults and provide

the same implementations of kmap_atomic() and kunmap_atomic() as we have
in i915_gem.c.  These will be unified later.

1 files changed, 31 insertions, 41 deletions

diff --git a/sys/dev/pci/drm/i915/i915_gem_execbuffer.c b/sys/dev/pci/drm/i915/i915_gem_execbuffer.c
index c37a64f6d5d..d089a953a30 100644
--- a/sys/dev/pci/drm/i915/i915_gem_execbuffer.c
+++ b/sys/dev/pci/drm/i915/i915_gem_execbuffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i915_gem_execbuffer.c,v 1.26 2014/01/21 08:57:22 kettenis Exp $	*/
+/*	$OpenBSD: i915_gem_execbuffer.c,v 1.27 2014/03/17 22:15:24 kettenis Exp $	*/
 /*
  * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org>
  *
@@ -54,30 +54,51 @@
 #include <sys/queue.h>
 #include <sys/task.h>
 
-int pagefault_disabled;
-
 static inline void
 pagefault_disable(void)
 {
-	KASSERT(pagefault_disabled == 0);
-	pagefault_disabled = 1;
+	KASSERT(curcpu()->ci_inatomic == 0);
+	curcpu()->ci_inatomic = 1;
 }
 
 static inline void
 pagefault_enable(void)
 {
-	KASSERT(pagefault_disabled == 1);
-	pagefault_disabled = 0;
+	KASSERT(curcpu()->ci_inatomic == 1);
+	curcpu()->ci_inatomic = 0;
 }
 
 static inline int
 in_atomic(void)
 {
-	return pagefault_disabled;
+	return curcpu()->ci_inatomic;
+}
+
+static inline void *
+kmap_atomic(struct vm_page *pg)
+{
+	vaddr_t va;
+
+#if defined (__HAVE_PMAP_DIRECT)
+	va = pmap_map_direct(pg);
+#else
+	extern vaddr_t pmap_tmpmap_pa(paddr_t);
+	va = pmap_tmpmap_pa(VM_PAGE_TO_PHYS(pg));
+#endif
+	return (void *)va;
+}
+
+static inline void
+kunmap_atomic(void *addr)
+{
+#if defined (__HAVE_PMAP_DIRECT)
+	pmap_unmap_direct((vaddr_t)addr);
+#else
+	extern void pmap_tmpunmap_pa(void);
+	pmap_tmpunmap_pa();
+#endif
 }
 
-static void *kmap_atomic(struct vm_page *);
-static void kunmap_atomic(void *);
 static inline struct vm_page *i915_gem_object_get_page(struct drm_i915_gem_object *, int);
 
 struct eb_objects {
@@ -1288,37 +1309,6 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
 	return ret;
 }
 
-static void *
-kmap_atomic(struct vm_page *pg)
-{
-	vaddr_t va;
-
-#if defined (__HAVE_PMAP_DIRECT)
-	va = pmap_map_direct(pg);
-#else
-	va = uvm_km_valloc(kernel_map, PAGE_SIZE);
-	if (va == 0)
-		return (NULL);
-	pmap_kenter_pa(va, VM_PAGE_TO_PHYS(pg), UVM_PROT_RW);
-	pmap_update(pmap_kernel());
-#endif
-	return (void *)va;
-}
-
-static void
-kunmap_atomic(void *addr)
-{
-	vaddr_t va = (vaddr_t)addr;
-
-#if defined (__HAVE_PMAP_DIRECT)
-	pmap_unmap_direct(va);
-#else
-	pmap_kremove(va, PAGE_SIZE);
-	pmap_update(pmap_kernel());
-	uvm_km_free(kernel_map, va, PAGE_SIZE);
-#endif
-}
-
 static inline struct vm_page *
 i915_gem_object_get_page(struct drm_i915_gem_object *obj, int n)
 {