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

[Chris Wilson]

 src/sna/kgem.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3ec663bf1c83ea1e470e94b9fb703346fc5bd39e
Merge: d9ecb91 abf1a16
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Nov 9 11:06:12 2013 +0000

    Merge branch 'master' of hsw:/usr/src/xf86-video-intel

commit d9ecb91ef123ee4e88020d0328a8c1fafad30e6c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Nov 7 14:58:08 2013 +0000

    sna: Skip an unmappable linear bo when searching through a cache for a GTT mapping
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 5a540e4..9a61c14 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -3544,6 +3544,9 @@ discard:
 				continue;
 			}
 		} else {
+			if (flags & CREATE_GTT_MAP && !kgem_bo_can_map(kgem, bo))
+				continue;
+
 			if (flags & (CREATE_CPU_MAP | CREATE_GTT_MAP)) {
 				if (first != NULL)
 					break;