diff --git a/sys/dev/drm2/drm_atomic.h b/sys/dev/drm2/drm_atomic.h
index 762c104..0f11f0b 100644
--- a/sys/dev/drm2/drm_atomic.h
+++ b/sys/dev/drm2/drm_atomic.h
@@ -47,12 +47,14 @@ typedef u_int64_t atomic64_t;
 static __inline atomic_t
 test_and_set_bit(int b, volatile void *p)
 {
-	int s = splhigh();
-	unsigned int m = 1<<b;
-	unsigned int r = *(volatile int *)p & m;
-	*(volatile int *)p |= m;
-	splx(s);
-	return r;
+	long bit, val;
+
+	bit = 1 << b;
+	do {
+		val = *(volatile long *)p;
+	} while (atomic_cmpset_long(p, val, val | bit) == 0);
+
+	return ((val & bit) != 0);
 }
 
 static __inline void
@@ -96,19 +98,21 @@ atomic_xchg(volatile int *p, int new)
 {
 	int old;
 
-	old = *p;
-	*p = new;
+	do {
+		old = *p;
+	} while(!atomic_cmpset_int(p, old, new));
 
 	return (old);
 }
 
-static __inline long
-atomic64_xchg(volatile long *p, long new)
+static __inline uint64_t
+atomic64_xchg(volatile uint64_t *p, uint64_t new)
 {
-	long old;
+	uint64_t old;
 
-	old = *p;
-	*p = new;
+	do {
+		old = *p;
+	} while(!atomic_cmpset_64(p, old, new));
 
 	return (old);
 }
@@ -117,16 +121,14 @@ static __inline int
 atomic_add_return(int i, atomic_t *p)
 {
 
-	atomic_add(i, p);
-	return *p;
+	return i + atomic_fetchadd_int(p, i);
 }
 
 static __inline int
 atomic_sub_return(int i, atomic_t *p)
 {
 
-	atomic_sub(i, p);
-	return *p;
+	return atomic_fetchadd_int(p, -i) - i;
 }
 
 #define	atomic_inc_return(v)		atomic_add_return(1, (v))
diff --git a/sys/dev/drm2/ttm/ttm_bo.c b/sys/dev/drm2/ttm/ttm_bo.c
index d7b1d30..3b13540 100644
--- a/sys/dev/drm2/ttm/ttm_bo.c
+++ b/sys/dev/drm2/ttm/ttm_bo.c
@@ -145,7 +145,7 @@ ttm_bo_wait_unreserved_locked(struct ttm_buffer_object *bo, bool interruptible)
 		flags = 0;
 		wmsg = "ttbowu";
 	}
-	while (!ttm_bo_is_reserved(bo)) {
+	while (ttm_bo_is_reserved(bo)) {
 		ret = -msleep(bo, &bo->glob->lru_lock, flags, wmsg, 0);
 		if (ret != 0)
 			break;
@@ -281,14 +281,15 @@ int ttm_bo_reserve(struct ttm_buffer_object *bo,
 	int put_count = 0;
 	int ret;
 
+	mtx_lock(&bo->glob->lru_lock);
 	ret = ttm_bo_reserve_nolru(bo, interruptible, no_wait, use_sequence,
 				   sequence);
 	if (likely(ret == 0)) {
-		mtx_lock(&glob->lru_lock);
 		put_count = ttm_bo_del_from_lru(bo);
 		mtx_unlock(&glob->lru_lock);
 		ttm_bo_list_ref_sub(bo, put_count, true);
-	}
+	} else
+		mtx_unlock(&bo->glob->lru_lock);
 
 	return ret;
 }
@@ -333,13 +334,14 @@ int ttm_bo_reserve_slowpath(struct ttm_buffer_object *bo,
 	struct ttm_bo_global *glob = bo->glob;
 	int put_count, ret;
 
+	mtx_lock(&glob->lru_lock);
 	ret = ttm_bo_reserve_slowpath_nolru(bo, interruptible, sequence);
 	if (likely(!ret)) {
-		mtx_lock(&glob->lru_lock);
 		put_count = ttm_bo_del_from_lru(bo);
 		mtx_unlock(&glob->lru_lock);
 		ttm_bo_list_ref_sub(bo, put_count, true);
-	}
+	} else
+		mtx_unlock(&glob->lru_lock);
 	return ret;
 }