From: Michel Dänzer <daenzer@vmware.com>
Date: Fri, 28 Aug 2009 09:42:07 +0000 (+0200)
Subject: Revert "libdrm_radeon: Always wait for BO idle in bo_map."
X-Git-Tag: libdrm-2.4.13~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19d6fadfa29993b261ebac2869b2289f6d3091c3;p=platform%2Fupstream%2Flibdrm.git

Revert "libdrm_radeon: Always wait for BO idle in bo_map."

This reverts commit 0a732983f059c353b267b6bf877e1f0eea4e033f.

Paul Nieminen and Dave Airlie pointed out on IRC that this shouldn't be
necessary. I was seeing visual corruption in X before I made this change, but
I can't reproduce that anymore so it was probably an unrelated issue.
---

diff --git a/libdrm/radeon/radeon_bo_gem.c b/libdrm/radeon/radeon_bo_gem.c
index add55db..76d80e7 100644
--- a/libdrm/radeon/radeon_bo_gem.c
+++ b/libdrm/radeon/radeon_bo_gem.c
@@ -152,7 +152,10 @@ static int bo_map(struct radeon_bo *bo, int write)
     int r;
     void *ptr;
 
-    if (bo_gem->map_count++ != 0 || bo_gem->priv_ptr) {
+    if (bo_gem->map_count++ != 0) {
+        return 0;
+    }
+    if (bo_gem->priv_ptr) {
 	goto wait;
     }