summaryrefslogtreecommitdiff
path: root/src/sna/gen5_render.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-12-09 11:19:13 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2012-12-09 12:37:43 +0000
commit3e82fcc8d243b7ffe1a3d3249a5cdb5fd068093f (patch)
tree49d98868bce1acfbf46446e9c460b73615fa4397 /src/sna/gen5_render.c
parentc8f622726a4463b419d032b379576cfb3bc492df (diff)
sna/gen4+: Refine test for preferring GPU spans
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/gen5_render.c')
-rw-r--r--src/sna/gen5_render.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index f8cea616..bff5066b 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -2692,13 +2692,15 @@ gen5_check_composite_spans(struct sna *sna,
return false;
}
- if ((flags & (COMPOSITE_SPANS_RECTILINEAR | COMPOSITE_SPANS_INPLACE_HINT)) == 0) {
- struct sna_pixmap *priv = sna_pixmap_from_drawable(dst->pDrawable);
- assert(priv);
-
- if ((priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo)) ||
- (priv->gpu_bo && kgem_bo_is_busy(priv->gpu_bo))) {
- return true;
+ if ((flags & COMPOSITE_SPANS_RECTILINEAR) == 0) {
+ if ((flags & COMPOSITE_SPANS_INPLACE_HINT) == 0) {
+ struct sna_pixmap *priv = sna_pixmap_from_drawable(dst->pDrawable);
+ assert(priv);
+
+ if ((priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo)) ||
+ (priv->gpu_bo && kgem_bo_is_busy(priv->gpu_bo))) {
+ return true;
+ }
}
DBG(("%s: fallback, non-rectilinear spans to idle bo\n",