Module Name: src
Committed By: riastradh
Date: Mon Apr 20 19:17:04 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo_util.c
Log Message:
First attempt to make ttm_buffer_object_transfer less bogus.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.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/ttm/ttm_bo_util.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.4 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c:1.4 Fri Jul 18 03:11:55 2014
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c Mon Apr 20 19:17:04 2015
@@ -524,8 +524,13 @@ static int ttm_buffer_object_transfer(st
INIT_LIST_HEAD(&fbo->swap);
INIT_LIST_HEAD(&fbo->io_reserve_lru);
#ifdef __NetBSD__
+ linux_mutex_init(&fbo->wu_mutex);
drm_vma_node_init(&fbo->vma_node);
+ uvm_obj_init(&fbo->uvmobj, bdev->driver->ttm_uvm_ops, true, 1);
+ mutex_obj_hold(bo->uvmobj.vmobjlock);
+ uvm_obj_setlock(&fbo->uvmobj, bo->uvmobj.vmobjlock);
#else
+ mutex_init(&fbo->wu_mutex);
drm_vma_node_reset(&fbo->vma_node);
#endif
atomic_set(&fbo->cpu_writers, 0);
