aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2010-10-05 16:00:48 +1000
committerDave Airlie <[email protected]>2010-10-05 16:00:48 +1000
commit12be1568d0ad648930a2bb04a10b3181061fa468 (patch)
treea895345f6234ee2f61c686ef053eaa1c7bdcc5b7 /src/gallium
parentd2c06b5037fe9282cbbc0c7acd84a1b286716507 (diff)
r600g: avoid unneeded bo wait
if we know the bo has gone not busy, no need to add another bo wait thanks to Andre (taiu) on irc for pointing this out.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/winsys/r600/drm/radeon_bo_pb.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/winsys/r600/drm/radeon_bo_pb.c b/src/gallium/winsys/r600/drm/radeon_bo_pb.c
index 33964814a02..a3452027f27 100644
--- a/src/gallium/winsys/r600/drm/radeon_bo_pb.c
+++ b/src/gallium/winsys/r600/drm/radeon_bo_pb.c
@@ -100,6 +100,10 @@ radeon_bo_pb_map_internal(struct pb_buffer *_buf,
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;
+ }
+ goto out;
}
if (buf->bo->data != NULL) {
@@ -115,7 +119,7 @@ radeon_bo_pb_map_internal(struct pb_buffer *_buf,
return NULL;
}
}
-
+out:
LIST_DELINIT(&buf->maplist);
return buf->bo->data;
}