Mesa (master): r300g: handle interaction between UNSYNCHRONIZED and DONTBLOCK flags in bo_map
Marek Olšák
mareko at kemper.freedesktop.org
Tue Feb 15 03:03:10 UTC 2011
Module: Mesa
Branch: master
Commit: 45e1cd522bd26a5aa3d424ea49975b90feef8450
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=45e1cd522bd26a5aa3d424ea49975b90feef8450
Author: Marek Olšák <maraeo at gmail.com>
Date: Tue Feb 15 03:43:57 2011 +0100
r300g: handle interaction between UNSYNCHRONIZED and DONTBLOCK flags in bo_map
The VBO module uses both, but they are somewhat opposite to each other.
In this case, we pick UNSYNCHRONIZED and ignore DONTBLOCK.
---
src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 38 +++++++++++-------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index 6de1ff7..e3c6195 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -158,30 +158,26 @@ static void *radeon_bo_map_internal(struct pb_buffer *_buf,
struct radeon_drm_cs *cs = flush_ctx;
struct drm_radeon_gem_mmap args = {};
void *ptr;
- /* prevents a call to radeon_bo_wait if (usage & DONTBLOCK) and
- * radeon_is_busy returns FALSE. */
- boolean may_be_busy = TRUE;
-
- if (flags & PB_USAGE_DONTBLOCK) {
- if (radeon_bo_is_referenced_by_cs(cs, bo)) {
- cs->flush_cs(cs->flush_data);
- return NULL;
- }
- if (radeon_bo_is_busy((struct r300_winsys_bo*)bo)) {
- return NULL;
- }
+ /* If it's not unsynchronized bo_map, flush CS if needed and then wait. */
+ if (!(flags & PB_USAGE_UNSYNCHRONIZED)) {
+ /* DONTBLOCK doesn't make sense with UNSYNCHRONIZED. */
+ if (flags & PB_USAGE_DONTBLOCK) {
+ if (radeon_bo_is_referenced_by_cs(cs, bo)) {
+ cs->flush_cs(cs->flush_data);
+ return NULL;
+ }
- may_be_busy = FALSE;
- }
+ if (radeon_bo_is_busy((struct r300_winsys_bo*)bo)) {
+ return NULL;
+ }
+ } else {
+ if (radeon_bo_is_referenced_by_cs(cs, bo)) {
+ cs->flush_cs(cs->flush_data);
+ }
- /* If it's not unsynchronized bo_map, flush CS if needed and then wait. */
- if (may_be_busy && !(flags & PB_USAGE_UNSYNCHRONIZED)) {
- if (radeon_bo_is_referenced_by_cs(cs, bo)) {
- cs->flush_cs(cs->flush_data);
+ radeon_bo_wait((struct r300_winsys_bo*)bo);
}
-
- radeon_bo_wait((struct r300_winsys_bo*)bo);
}
/* Return the pointer if it's already mapped. */
More information about the mesa-commit
mailing list