r600g: Buffer object maps imply a wait.

[mesa.git] / src / gallium / winsys / r600 / drm / radeon_bo_pb.c

diff --git a/src/gallium/winsys/r600/drm/radeon_bo_pb.c b/src/gallium/winsys/r600/drm/radeon_bo_pb.c
index 8cf6a781306bf8dc1e24145bf245f27e81686f83..b8744b00eb4e2302872e3f4e101a968fa5148ff8 100644 (file)
--- a/src/gallium/winsys/r600/drm/radeon_bo_pb.c
+++ b/src/gallium/winsys/r600/drm/radeon_bo_pb.c
@@ -63,20 +63,26 @@ radeon_bo_pb_map_internal(struct pb_buffer *_buf,
                }
        }
 
-       if (buf->bo->data != NULL) {
-               LIST_DELINIT(&buf->maplist);
-               return buf->bo->data;
-       }
-
        if (flags & PB_USAGE_DONTBLOCK) {
                uint32_t domain;
                if (radeon_bo_busy(buf->mgr->radeon, buf->bo, &domain))
                        return NULL;
        }
 
-       if (radeon_bo_map(buf->mgr->radeon, buf->bo)) {
-               return NULL;
+       if (buf->bo->data != NULL) {
+               if (radeon_bo_wait(buf->mgr->radeon, buf->bo)) {
+                       return NULL;
+               }
+       } else {
+               if (radeon_bo_map(buf->mgr->radeon, buf->bo)) {
+                       return NULL;
+               }
+               if (radeon_bo_wait(buf->mgr->radeon, buf->bo)) {
+                       radeon_bo_unmap(buf->mgr->radeon, buf->bo);
+                       return NULL;
+               }
        }
+
        LIST_DELINIT(&buf->maplist);
        return buf->bo->data;
 }