summaryrefslogtreecommitdiff
path: root/src/sna/gen6_render.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/sna/gen6_render.c')
-rw-r--r--src/sna/gen6_render.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index c6143631..a274f9b4 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -3132,15 +3132,15 @@ gen6_check_composite_spans(struct sna *sna,
}
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);
+ 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 (priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo))
+ return true;
+
+ if ((flags & COMPOSITE_SPANS_INPLACE_HINT) == 0 &&
+ priv->gpu_bo && kgem_bo_is_busy(priv->gpu_bo))
+ return true;
DBG(("%s: fallback, non-rectilinear spans to idle bo\n",
__FUNCTION__));