sna: Fallback when wedged and trying to use the BLT copy routines

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index 0169d11..e63b360 100644 (file)
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -2862,7 +2862,7 @@ bool sna_blt_copy_boxes(struct sna *sna, uint8_t alu,
            src_bo->tiling, dst_bo->tiling,
            src_bo->pitch, dst_bo->pitch));
 
-       if (!kgem_bo_can_blt(kgem, src_bo) || !kgem_bo_can_blt(kgem, dst_bo)) {
+       if (wedged(sna) || !kgem_bo_can_blt(kgem, src_bo) || !kgem_bo_can_blt(kgem, dst_bo)) {
                DBG(("%s: cannot blt to src? %d or dst? %d\n",
                     __FUNCTION__,
                     kgem_bo_can_blt(kgem, src_bo),

diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c
index 925ba14..feb80dc 100644 (file)
--- a/src/sna/sna_tiling.c
+++ b/src/sna/sna_tiling.c
@@ -700,7 +700,8 @@ bool sna_tiling_blt_copy_boxes(struct sna *sna, uint8_t alu,
        int max_size, step;
        bool ret = false;
 
-       if (!kgem_bo_can_blt(&sna->kgem, src_bo) ||
+       if (wedged(sna) ||
+           !kgem_bo_can_blt(&sna->kgem, src_bo) ||
            !kgem_bo_can_blt(&sna->kgem, dst_bo)) {
                /* XXX */
                DBG(("%s: tiling blt fail: src?=%d, dst?=%d\n",