diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-03-20 22:57:50 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-03-21 09:05:58 +0000 |
| commit | 1db1eced5462723811e535a53cb41b108fc6c5a3 (patch) | |
| tree | d13bb750eb152ec1b958b6dabefbadbc562b134f /src | |
| parent | 38b0cc24b45afd4ed57187fb066896bf1e467f45 (diff) | |
sna: Tidy an assertion when handling tiled copies
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/kgem.c | 2 | ||||
| -rw-r--r-- | src/sna/sna_tiling.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c index bb09214e..c0229005 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -1095,6 +1095,8 @@ static void __kgem_bo_destroy(struct kgem *kgem, struct kgem_bo *bo) goto destroy; if (bo->vmap) { + DBG(("%s: handle=%d is vmapped, tracking until free\n", + __FUNCTION__, bo->handle)); if (bo->rq == NULL) { if (bo->needs_flush && kgem_busy(kgem, bo->handle)) { list_add(&bo->request, &kgem->flushing); diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c index 493e3132..dcb4d1dc 100644 --- a/src/sna/sna_tiling.c +++ b/src/sna/sna_tiling.c @@ -389,8 +389,8 @@ sna_tiling_fill_boxes(struct sna *sna, int16_t dx = this.extents.x1; int16_t dy = this.extents.y1; + assert(kgem_bo_can_blt(&sna->kgem, bo)); assert(bo->pitch <= 8192); - assert(bo->tiling != I915_TILING_Y); if (!sna->render.copy_boxes(sna, GXcopy, dst, dst_bo, 0, 0, |