summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-01-05 14:26:05 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2012-01-05 14:26:05 +0000
commit307276d7da99ceb84c175e412452e5d86d615cf4 (patch)
treefc0338e0240eebf69c01161e3432f3b7f693aba0
parentf9451aaa39e1d77b08d2201f5c4a44ab834f2237 (diff)
sna: Enable using the render pipeline for uploads to Y-tiled pixmaps
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sna/sna_io.c b/src/sna/sna_io.c
index 494a3bf8..1c25b9de 100644
--- a/src/sna/sna_io.c
+++ b/src/sna/sna_io.c
@@ -318,7 +318,7 @@ void sna_write_boxes(struct sna *sna,
DBG(("%s x %d\n", __FUNCTION__, nbox));
- if (DEBUG_NO_IO || kgem->wedged || dst_bo->tiling == I915_TILING_Y ||
+ if (DEBUG_NO_IO || kgem->wedged ||
!kgem_bo_map_will_stall(kgem, dst_bo)) {
fallback:
write_boxes_inplace(kgem,
@@ -329,7 +329,7 @@ fallback:
}
/* Try to avoid switching rings... */
- if (kgem->ring == KGEM_RENDER) {
+ if (dst_bo->tiling == I915_TILING_Y || kgem->ring == KGEM_RENDER) {
PixmapRec tmp;
BoxRec extents;