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

[Chris Wilson]

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

New commits:
commit bfe25b8110fc4d4761b57e3ec07b8467890b90a1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 31 11:00:21 2013 +0100

    sna: Fix interaction between WT mapping of scanouts and allocating from stolen
    
    If we allocate the scanout from stolen, we cannot then access it via the
    CPU - so prevent the mapping in those cases.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.h b/src/sna/kgem.h
index fede4d4..a6e48b6 100644
--- a/src/sna/kgem.h
+++ b/src/sna/kgem.h
@@ -578,7 +578,7 @@ static inline bool kgem_bo_can_map__cpu(struct kgem *kgem,
 					struct kgem_bo *bo,
 					bool write)
 {
-	if (bo->scanout && (!kgem->has_wt || write))
+	if (bo->scanout && (write || bo->purged || !kgem->has_wt))
 		return false;
 
 	if (kgem->has_llc)