From 671e4b44b2b2809e032a3d2a9b45ecf3af547100 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 28 Oct 2013 11:28:01 +0000
Subject: [PATCH] sna: Account for extra guard pages around snooped BO in
 aperture checks

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/kgem.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index f4ad4693..8659765f 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -4643,6 +4643,8 @@ static bool aperture_check(struct kgem *kgem, unsigned num_pages)
 		aperture.aper_available_size -= 4 * 1024 * 1024;
 		if (kgem->gen < 040)
 			aperture.aper_available_size -= kgem->aperture_fenced * PAGE_SIZE;
+		if (!kgem->has_llc)
+			aperture.aper_available_size -= 2 * kgem->nexec * PAGE_SIZE;
 
 		if (num_pages < aperture.aper_available_size / PAGE_SIZE)
 			return true;