From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Mon, 14 Apr 2008 11:52:33 +0000 (+0200)
Subject: Fix buffer object map wait error.
X-Git-Tag: submit/1.0/20121108.012404~901
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ad1bd5bd95db71500edfcea8b46421d7f3cdb15;p=profile%2Fivi%2Flibdrm.git

Fix buffer object map wait error.
Add some branch prediction hints.
---

diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index 6f28753..88b2ee6 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -1225,11 +1225,13 @@ static int drm_buffer_object_map(struct drm_file *file_priv, uint32_t handle,
 		bo->priv_flags &= ~_DRM_BO_FLAG_UNLOCKED;
 
 		ret = drm_bo_wait(bo, 0, 1, no_wait, 1);
+		if (unlikely(ret))
+			goto out;
 
 		if (bo->mem.flags & DRM_BO_FLAG_CACHED_MAPPED)
 			drm_bo_evict_cached(bo);
 
-	} while (bo->priv_flags & _DRM_BO_FLAG_UNLOCKED);
+	} while (unlikely(bo->priv_flags & _DRM_BO_FLAG_UNLOCKED));
 
 	atomic_inc(&bo->mapped);
 	mutex_lock(&dev->struct_mutex);
@@ -1242,6 +1244,7 @@ static int drm_buffer_object_map(struct drm_file *file_priv, uint32_t handle,
 	} else
 		drm_bo_fill_rep_arg(bo, rep);
 
+ out:
 	mutex_unlock(&bo->mutex);
 	drm_bo_usage_deref_unlocked(&bo);
 
@@ -1610,7 +1613,7 @@ int drm_bo_do_validate(struct drm_buffer_object *bo,
 		if (ret)
 			goto out;
 
-	}  while(bo->priv_flags & _DRM_BO_FLAG_UNLOCKED);
+	} while(unlikely(bo->priv_flags & _DRM_BO_FLAG_UNLOCKED));
 
 	ret = drm_buffer_object_validate(bo,
 					 fence_class,