diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-10-19 13:08:50 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-10-19 13:11:24 +0100 |
| commit | 63aa84ef57ff1e55d2df6d680d6bbf88be0619a6 (patch) | |
| tree | 0a8f0b92abd1a74fe6e0236e761795ec6608f58c | |
| parent | 25f2d181946738d1ac2deb724eb48453c8692ed1 (diff) | |
sna/gen6: Apply the unknown blitter death workaround
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_blt.c | 39 | ||||
| -rw-r--r-- | src/sna/sna_reg.h | 2 |
2 files changed, 37 insertions, 4 deletions
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c index 01487857..3b2c0b90 100644 --- a/src/sna/sna_blt.c +++ b/src/sna/sna_blt.c @@ -102,7 +102,21 @@ static void blt_done(struct sna *sna, const struct sna_composite_op *op) { struct kgem *kgem = &sna->kgem; - DBG(("%s: nbatch=%d\n", __FUNCTION__, kgem->nbatch)); + _kgem_set_mode(kgem, KGEM_BLT); + (void)op; +} + +static void gen6_blt_copy_done(struct sna *sna, const struct sna_composite_op *op) +{ + struct kgem *kgem = &sna->kgem; + + if (kgem_check_batch(kgem, 3)) { + uint32_t *b = kgem->batch + kgem->nbatch; + b[0] = XY_SETUP_CLIP; + b[1] = b[2] = 0; + kgem->nbatch += 3; + } + _kgem_set_mode(kgem, KGEM_BLT); (void)op; } @@ -815,7 +829,10 @@ prepare_blt_copy(struct sna *sna, op->blt = blt_copy_composite; op->box = blt_copy_composite_box; op->boxes = blt_copy_composite_boxes; - op->done = blt_done; + if (sna->kgem.gen >= 60) + op->done = gen6_blt_copy_done; + else + op->done = blt_done; return sna_blt_copy_init(sna, &op->u.blt, priv->gpu_bo, @@ -1297,6 +1314,12 @@ static void sna_blt_copy_op_done(struct sna *sna, blt_done(sna, &op->base); } +static void gen6_blt_copy_op_done(struct sna *sna, + const struct sna_copy_op *op) +{ + gen6_blt_copy_done(sna, &op->base); +} + bool sna_blt_copy(struct sna *sna, uint8_t alu, struct kgem_bo *src, struct kgem_bo *dst, @@ -1319,7 +1342,10 @@ bool sna_blt_copy(struct sna *sna, uint8_t alu, return FALSE; op->blt = sna_blt_copy_op_blt; - op->done = sna_blt_copy_op_done; + if (sna->kgem.gen >= 60) + op->done = gen6_blt_copy_op_done; + else + op->done = sna_blt_copy_op_done; return TRUE; } @@ -1539,6 +1565,13 @@ Bool sna_blt_copy_boxes(struct sna *sna, uint8_t alu, _kgem_submit(kgem); } while (nbox); + if (kgem->gen >= 60 && kgem_check_batch(kgem, 3)) { + uint32_t *b = kgem->batch + kgem->nbatch; + b[0] = XY_SETUP_CLIP; + b[1] = b[2] = 0; + kgem->nbatch += 3; + } + _kgem_set_mode(kgem, KGEM_BLT); return TRUE; } diff --git a/src/sna/sna_reg.h b/src/sna/sna_reg.h index 8ca90895..75f35c40 100644 --- a/src/sna/sna_reg.h +++ b/src/sna/sna_reg.h @@ -46,7 +46,7 @@ #define XY_COLOR_BLT_WRITE_RGB (1<<20) #define XY_COLOR_BLT_TILED (1<<11) -#define XY_SETUP_CLIP_BLT_CMD ((2<<29)|(3<<22)|1) +#define XY_SETUP_CLIP ((2<<29)|(3<<22)|1) #define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)|6) #define XY_SRC_COPY_BLT_WRITE_ALPHA (1<<21) |