Module Name: src
Committed By: martin
Date: Mon Aug 18 07:49:10 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm [netbsd-7]: drm_gem.c
src/sys/external/bsd/drm2/dist/drm/ttm [netbsd-7]: ttm_bo.c
src/sys/external/bsd/drm2/ttm [netbsd-7]: ttm_bo_vm.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #36):
sys/external/bsd/drm2/dist/drm/drm_gem.c: revision 1.5
sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c: revision 1.5
sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.3
sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c: revision 1.6
bus_space_mmap cookies are not paddrs, so don't pmap_enter them!
For gem and ttm objects backed by uvm_aobjs, share the vmobjlock.
XXX pullup to 7
Simplify previous.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/external/bsd/drm2/dist/drm/drm_gem.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
cvs rdiff -u -r1.2 -r1.2.4.1 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/dist/drm/drm_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.4 src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.4.2.1
--- src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.4 Wed Jul 16 20:56:24 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_gem.c Mon Aug 18 07:49:10 2014
@@ -155,6 +155,13 @@ int drm_gem_object_init(struct drm_devic
#ifdef __NetBSD__
obj->gemo_shm_uao = uao_create(size, 0);
+ /*
+ * XXX This is gross. We ought to do it the other way around:
+ * set the uao to have the main uvm object's lock. However,
+ * uvm_obj_setlock is not safe on uvm_aobjs.
+ */
+ mutex_obj_hold(obj->gemo_shm_uao->vmobjlock);
+ uvm_obj_setlock(&obj->gemo_uvmobj, obj->gemo_shm_uao->vmobjlock);
#else
filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
if (IS_ERR(filp))
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.4 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.4.2.1
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.4 Sun Jul 27 00:40:39 2014
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Mon Aug 18 07:49:10 2014
@@ -33,6 +33,7 @@
#ifdef __NetBSD__
#include <sys/types.h>
#include <uvm/uvm_extern.h>
+#include <uvm/uvm_object.h>
#endif
#include <drm/ttm/ttm_module.h>
@@ -286,7 +287,21 @@ static int ttm_bo_add_ttm(struct ttm_buf
break;
}
+#ifdef __NetBSD__
+ if (ret)
+ return ret;
+
+ /*
+ * XXX This is gross. We ought to do it the other way around:
+ * set the uao to have the main uvm object's lock. However,
+ * uvm_obj_setlock is not safe on uvm_aobjs.
+ */
+ mutex_obj_hold(bo->ttm->swap_storage->vmobjlock);
+ uvm_obj_setlock(&bo->uvmobj, bo->ttm->swap_storage->vmobjlock);
+ return 0;
+#else
return ret;
+#endif
}
static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
Index: src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2.4.1
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2 Sat Aug 9 00:18:58 2014
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Mon Aug 18 07:49:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.2 2014/08/09 00:18:58 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.2.4.1 2014/08/18 07:49:10 martin 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.2 2014/08/09 00:18:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.2.4.1 2014/08/18 07:49:10 martin Exp $");
#include <sys/types.h>
@@ -89,6 +89,7 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
unsigned i;
vm_prot_t vm_prot; /* VM_PROT_* */
pgprot_t pgprot; /* VM_PROT_* | PMAP_* cacheability flags */
+ unsigned mmapflags;
int ret;
/* Copy-on-write mappings make no sense for the graphics aperture. */
@@ -178,13 +179,19 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
/* XXX PGO_ALLPAGES? */
if (pps[i] == PGO_DONTCARE)
continue;
- if (bo->mem.bus.is_iomem)
- paddr = bus_space_mmap(bdev->memt, u.base,
- ((startpage + i) << PAGE_SHIFT), vm_prot, 0);
- else
+ if (bo->mem.bus.is_iomem) {
+ const paddr_t cookie = bus_space_mmap(bdev->memt,
+ u.base, ((startpage + i) << PAGE_SHIFT), vm_prot,
+ 0);
+
+ paddr = pmap_phys_address(cookie);
+ mmapflags = pmap_mmap_flags(cookie);
+ } else {
paddr = page_to_phys(u.ttm->pages[startpage + i]);
+ mmapflags = 0;
+ }
ret = -pmap_enter(ufi->orig_map->pmap, vaddr + i*PAGE_SIZE,
- paddr, vm_prot, (PMAP_CANFAIL | pgprot));
+ paddr, vm_prot, (PMAP_CANFAIL | pgprot | mmapflags));
if (ret)
goto out3;
}
