From 45e1cd522bd26a5aa3d424ea49975b90feef8450 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 15 Feb 2011 03:43:57 +0100 Subject: [PATCH] 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 | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c index 6de1ff7745d..e3c6195d5f6 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. */ -- 2.30.2