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

[Chris Wilson]

 src/sna/kgem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c67e9da5fc4c47f3f67082bd4adaf80d9e7399f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Sep 28 10:13:25 2013 +0100

    sna: Avoid reads from a GTT mmapped upload buffer
    
    We now allow LLC machines to also use GTT upload buffers, so we need to
    be cache when scanning the cache to look for suitable buffers.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 2a5820c..4bd12f6 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -5658,7 +5658,7 @@ struct kgem_bo *kgem_create_buffer(struct kgem *kgem,
 			assert(bo->mmapped);
 			assert(bo->mmapped == MMAPPED_GTT || kgem->has_llc || bo->base.snoop);
 
-			if (!kgem->has_llc && (bo->write & ~flags) & KGEM_BUFFER_INPLACE) {
+			if ((bo->write & ~flags) & KGEM_BUFFER_INPLACE && !bo->base.snoop) {
 				DBG(("%s: skip write %x buffer, need %x\n",
 				     __FUNCTION__, bo->write, flags));
 				continue;