From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 27 Oct 2013 16:45:53 +0000 (+0000)
Subject: sna: Fallthrough to opportunistic flushing after aperture checks
X-Git-Tag: 2.99.906~89
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9266e35b42e17293be59cff4c5097f7755112349;p=platform%2Fupstream%2Fxf86-video-intel.git

sna: Fallthrough to opportunistic flushing after aperture checks

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 36190fa..5fdeebd 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -4706,7 +4706,8 @@ bool kgem_check_bo(struct kgem *kgem, ...)
 	if (num_pages + kgem->aperture > kgem->aperture_high) {
 		DBG(("%s: final aperture usage (%d) is greater than high water mark (%d)\n",
 		     __FUNCTION__, num_pages + kgem->aperture, kgem->aperture_high));
-		return aperture_check(kgem, num_pages + kgem->aperture);
+		if (!aperture_check(kgem, num_pages + kgem->aperture))
+			return false;
 	}
 
 	return kgem_flush(kgem, flush);
@@ -4771,7 +4772,8 @@ bool kgem_check_bo_fenced(struct kgem *kgem, struct kgem_bo *bo)
 	if (kgem->aperture + num_pages(bo) > kgem->aperture_high - kgem->aperture_fenced) {
 		DBG(("%s: final aperture usage (%d) is greater than high water mark (%d)\n",
 		     __FUNCTION__, num_pages(bo) + kgem->aperture, kgem->aperture_high));
-		return aperture_check(kgem, num_pages(bo) + kgem->aperture + kgem->aperture_fenced);
+		if (!aperture_check(kgem, num_pages(bo) + kgem->aperture + kgem->aperture_fenced))
+			return false;
 	}
 
 	return kgem_flush(kgem, bo->flush);
@@ -4843,7 +4845,8 @@ bool kgem_check_many_bo_fenced(struct kgem *kgem, ...)
 	if (num_pages + kgem->aperture > kgem->aperture_high - kgem->aperture_fenced) {
 		DBG(("%s: final aperture usage (%d) is greater than high water mark (%d)\n",
 		     __FUNCTION__, num_pages + kgem->aperture, kgem->aperture_high));
-		return aperture_check(kgem, num_pages + kgem->aperture + kgem->aperture_fenced);
+		if (!aperture_check(kgem, num_pages + kgem->aperture + kgem->aperture_fenced))
+			return false;
 	}
 
 	return kgem_flush(kgem, flush);