diff --git a/src/gallium/winsys/drm/radeon/core/radeon_buffer.c b/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
index 0d0fdc5bd86..93748e22567 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
@@ -141,6 +141,8 @@ static void *radeon_buffer_map(struct pipe_winsys *ws,
         write = 1;
     }
 
+    radeon_bo_wait(radeon_buffer->bo);
+
     if (radeon_bo_map(radeon_buffer->bo, write))
         return NULL;
     return radeon_buffer->bo->ptr;