diff options
author | Michel Dänzer <daenzer@vmware.com> | 2009-08-28 11:42:07 +0200 |
---|---|---|
committer | Michel Dänzer <michel@daenzer.net> | 2009-08-28 11:42:07 +0200 |
commit | 19d6fadfa29993b261ebac2869b2289f6d3091c3 (patch) | |
tree | 1592615c90b42a935f4c6a9982b459773c1b1e14 | |
parent | 0a732983f059c353b267b6bf877e1f0eea4e033f (diff) | |
download | libdrm-19d6fadfa29993b261ebac2869b2289f6d3091c3.tar.gz libdrm-19d6fadfa29993b261ebac2869b2289f6d3091c3.tar.bz2 libdrm-19d6fadfa29993b261ebac2869b2289f6d3091c3.zip |
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.
-rw-r--r-- | libdrm/radeon/radeon_bo_gem.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libdrm/radeon/radeon_bo_gem.c b/libdrm/radeon/radeon_bo_gem.c index add55db9..76d80e7e 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; } |