From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 6 Nov 2007 08:47:57 +0000 (+0100)
Subject: Avoid buffers not ending up on a list in some cases.
X-Git-Tag: android-x86-1.6~526^2~107
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=40fb079aebae4277813e6a32e2e93c81dc0038e3;p=android-x86%2Fexternal-libdrm.git

Avoid buffers not ending up on a list in some cases.
---

diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index 6bfc6df5..b1077987 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -1331,16 +1331,25 @@ int drm_bo_move_buffer(struct drm_buffer_object *bo, uint64_t new_mem_flags,
 	ret = drm_bo_handle_move_mem(bo, &mem, 0, no_wait);
 
 out_unlock:
+	mutex_lock(&dev->struct_mutex);
 	if (ret || !move_unfenced) {
-		mutex_lock(&dev->struct_mutex);
 		if (mem.mm_node) {
 			if (mem.mm_node != bo->pinned_node)
 				drm_mm_put_block(mem.mm_node);
 			mem.mm_node = NULL;
 		}
-		mutex_unlock(&dev->struct_mutex);
+		drm_bo_add_to_lru(bo);
+		if (bo->priv_flags & _DRM_BO_FLAG_UNFENCED) {
+			DRM_WAKEUP(&bo->event_queue);
+			DRM_FLAG_MASKED(bo->priv_flags, 0,
+					_DRM_BO_FLAG_UNFENCED);
+		}
+	} else {
+		list_add_tail(&bo->lru, &bm->unfenced);
+		DRM_FLAG_MASKED(bo->priv_flags, _DRM_BO_FLAG_UNFENCED,
+				_DRM_BO_FLAG_UNFENCED);
 	}
-
+	mutex_unlock(&dev->struct_mutex);
 	mutex_unlock(&bm->evict_mutex);
 	return ret;
 }