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

[Chris Wilson]

 src/sna/kgem.c |    4 +---
 src/sna/kgem.h |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 278ee155d572d3132d27823bb69995a8cc61c2c0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 31 17:01:47 2013 +0100

    sna: Relax readback constraint for CPU mappings of scanouts
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 27f0089..29a5dfc 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -5016,7 +5016,6 @@ void *kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo)
 	     __FUNCTION__, bo->handle, bytes(bo), (int)__MAP_TYPE(bo->map)));
 	assert(!bo->purged);
 	assert(list_is_empty(&bo->list));
-	assert(!bo->scanout || kgem->has_wt);
 	assert(bo->proxy == NULL);
 
 	if (IS_CPU_MAP(bo->map))
@@ -5065,7 +5064,6 @@ void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo)
 	assert(!bo->purged);
 	assert(list_is_empty(&bo->list));
 	assert(bo->proxy == NULL);
-	assert(!bo->scanout || kgem->has_wt);
 
 	if (IS_CPU_MAP(bo->map))
 		return MAP(bo->map);
@@ -5237,7 +5235,7 @@ void kgem_bo_sync__cpu(struct kgem *kgem, struct kgem_bo *bo)
 void kgem_bo_sync__cpu_full(struct kgem *kgem, struct kgem_bo *bo, bool write)
 {
 	DBG(("%s: handle=%d\n", __FUNCTION__, bo->handle));
-	assert(!bo->scanout || (kgem->has_wt && !write));
+	assert(!bo->scanout || !write);
 
 	if (write || bo->needs_flush)
 		kgem_bo_submit(kgem, bo);
diff --git a/src/sna/kgem.h b/src/sna/kgem.h
index a6e48b6..e726530 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 && (write || bo->purged || !kgem->has_wt))
+	if (bo->scanout && (write || bo->purged))
 		return false;
 
 	if (kgem->has_llc)