diff options
| -rw-r--r-- | src/sna/gen4_render.c | 16 | ||||
| -rw-r--r-- | src/sna/gen5_render.c | 16 | ||||
| -rw-r--r-- | src/sna/gen6_render.c | 16 |
3 files changed, 24 insertions, 24 deletions
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c index ee373789..d6ba3466 100644 --- a/src/sna/gen4_render.c +++ b/src/sna/gen4_render.c @@ -2681,15 +2681,15 @@ gen4_check_composite_spans(struct sna *sna, return FORCE_SPANS > 0; 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__)); diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c index 3a9fd8c1..054829e1 100644 --- a/src/sna/gen5_render.c +++ b/src/sna/gen5_render.c @@ -2693,15 +2693,15 @@ gen5_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__)); 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__)); |