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

[Chris Wilson]

 src/sna/kgem.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit c88303a8688b9b0d807b5a31581cb1bde8553966
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Nov 13 18:57:56 2015 +0000

    sna: Limit the allocation retries
    
    If we repeatedly fail to allocate the next batch, just give up.
    
    Reported-by: Arkadiusz Miskiewicz <arekm at maven.pl>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 0ecc11f..120bd82 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1789,8 +1789,11 @@ restart:
 				goto restart;
 		}
 
-		if (kgem_cleanup_cache(kgem))
-			goto restart;
+		if (flags & CREATE_NO_THROTTLE) {
+			flags &= ~CREATE_NO_THROTTLE;
+			if (kgem_cleanup_cache(kgem))
+				goto restart;
+		}
 
 		DBG(("%s: unable to map batch bo, mallocing(size=%d)\n",
 		     __FUNCTION__, sizeof(uint32_t)*kgem->batch_size));