xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_vbo.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9b0e03e98ab739efb4031f81cc4a1a50b3d87a42
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Jan 24 00:13:25 2011 -0500

    vbo: avoid extra cs revalidation in vbo alloc
    
    Make sure we have a valid bo before revalidating.

diff --git a/src/radeon_vbo.c b/src/radeon_vbo.c
index a72224f..0997046 100644
--- a/src/radeon_vbo.c
+++ b/src/radeon_vbo.c
@@ -191,17 +191,17 @@ again_alloc:
 	insert_at_head(&accel_state->bo_reserved, dma_bo);
     }
 
+    if (is_empty_list(&accel_state->bo_reserved))
+	goto again_alloc;
+
+    bo = first_elem(&accel_state->bo_reserved)->bo;
+
     /* need a space check */
     if (radeon_cs_space_check_with_bo(info->cs,
-				      first_elem(&accel_state->bo_reserved)->bo,
+				      bo,
 				      RADEON_GEM_DOMAIN_GTT, 0))
-	fprintf(stderr,"failed to revalidated\n");
+	ErrorF("failed to revalidate\n");
 
-    if (is_empty_list(&accel_state->bo_reserved)) {
-	goto again_alloc;
-    }
-
-    bo = first_elem(&accel_state->bo_reserved)->bo;
     return bo;
 }