summaryrefslogtreecommitdiff
path: root/src/sna
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-05-08 15:12:51 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-05-08 15:12:51 +0100
commit2a9a93e4484e0c616724610f4c8019fcbaa7ad53 (patch)
tree32c1c065b904d72b5419f38c5d414e688b5370f8 /src/sna
parent613902b60e0f2ca2a916e68306a1a37bc236d00d (diff)
sna: Only avoid ring switching for indirect uploads
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna')
-rw-r--r--src/sna/sna_io.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/sna/sna_io.c b/src/sna/sna_io.c
index 3de164bf..9b56c99d 100644
--- a/src/sna/sna_io.c
+++ b/src/sna/sna_io.c
@@ -582,9 +582,7 @@ fallback:
}
/* Try to avoid switching rings... */
- if (!can_blt ||
- kgem->ring == KGEM_RENDER ||
- (kgem->has_semaphores && kgem->mode == KGEM_NONE) ||
+ if (!can_blt || kgem->ring == KGEM_RENDER ||
upload_too_large(sna, extents.x2 - extents.x1, extents.y2 - extents.y1)) {
PixmapRec tmp;