r600g: Made radeon_bo_pb_map_internal() actually call radeon_bo_map().

This ensures that we increase bo->map_count when radeon_bo_map_internal()
returns successfully, which in turn makes sure we don't decrement
bo->map_count below zero later.

Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>

diff --git a/src/gallium/winsys/r600/drm/radeon_bo_pb.c b/src/gallium/winsys/r600/drm/radeon_bo_pb.c
index 4454f5213aad948595daa43b8cfb03c61e049560..f74b934c374d96a06b4a2b5354aba58ecfdec471 100644 (file)
--- a/src/gallium/winsys/r600/drm/radeon_bo_pb.c
+++ b/src/gallium/winsys/r600/drm/radeon_bo_pb.c
@@ -80,7 +80,7 @@ radeon_bo_pb_map_internal(struct pb_buffer *_buf,
        struct pipe_context *pctx = ctx;
 
        if (flags & PB_USAGE_UNSYNCHRONIZED) {
-               if (!buf->bo->data && radeon_bo_map(buf->mgr->radeon, buf->bo)) {
+               if (radeon_bo_map(buf->mgr->radeon, buf->bo)) {
                        return NULL;
                }
                LIST_DELINIT(&buf->maplist);
@@ -106,18 +106,12 @@ radeon_bo_pb_map_internal(struct pb_buffer *_buf,
                goto out;
        }
 
-       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;
-               }
+       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;
        }
 out:
        LIST_DELINIT(&buf->maplist);