xf86-video-intel: src/sna/kgem.c

[Chris Wilson]

 src/sna/kgem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8ae105b2c7a06fc81757f06ec1aaa2447b53498a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Dec 18 18:20:11 2011 +0000

    sna: Only retire for the VMA search if there are cached VMA
    
    If there are no VMA that might become inactive, there is no point
    scanning the inactive lists if we are searching for VMA.
    
    This prevents the regression in firefox-fishbowl whilst maintaining most
    of the improvement with PutComposite.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 3033f5f..e05bb6c 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1747,7 +1747,7 @@ struct kgem_bo *kgem_create_2d(struct kgem *kgem,
 				assert(bo->domain != DOMAIN_GPU && !kgem_busy(kgem, bo->handle));
 				return kgem_bo_reference(bo);
 			}
-		} while (kgem_retire(kgem));
+		} while (!list_is_empty(&kgem->vma_cache) && kgem_retire(kgem));
 
 		goto skip_active_search;
 	}