From d69a4f118a729edfb82498501ddb99caf2f3fb93 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 28 Oct 2013 10:33:57 +0000
Subject: [PATCH] sna: Leave extra room in the mappable aperture for fence
 alignment

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 ecd3674d..1e1da04e 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -4641,6 +4641,8 @@ static bool aperture_check(struct kgem *kgem, unsigned num_pages)
 
 		/* Leave some space in case of alignment issues */
 		aperture.aper_available_size -= 4 * 1024 * 1024;
+		if (kgem->gen < 040)
+			aperture.aper_available_size -= kgem->aperture_fenced * PAGE_SIZE;
 
 		if (num_pages < aperture.aper_available_size / PAGE_SIZE)
 			return true;