diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-02-27 11:36:35 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-02-27 11:36:35 +0000 |
| commit | 4adb6967a84af8a04769c2d936a41f4a49ed1428 (patch) | |
| tree | 1782752f1b7b3e89ec93dc5f3782a60ff3edf792 | |
| parent | 4fbb0baff525115037f7e5a1689541880a6cdafb (diff) | |
meh
| -rw-r--r-- | src/sna/kgem.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 20979944..48c131b1 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -1376,15 +1376,10 @@ static void kgem_finish_partials(struct kgem *kgem) if (!bo->base.exec) continue; - if (bo->mmapped) { - assert(bo->write & KGEM_BUFFER_WRITE_INPLACE); - assert(!bo->need_io); - if (kgem->has_llc || !IS_CPU_MAP(bo->base.map)) { - DBG(("%s: retaining partial upload buffer (%d/%d)\n", - __FUNCTION__, bo->used, bytes(&bo->base))); - continue; - } - goto decouple; + if (bo->write & KGEM_BUFFER_WRITE_INPLACE) { + DBG(("%s: retaining partial upload buffer (%d/%d)\n", + __FUNCTION__, bo->used, bytes(&bo->base))); + continue; } if (!bo->used) { @@ -3471,8 +3466,6 @@ struct kgem_bo *kgem_create_buffer(struct kgem *kgem, } DBG(("%s: created handle=%d for buffer\n", __FUNCTION__, bo->base.handle)); - - bo->base.domain = DOMAIN_CPU; } bo->mem = kgem_bo_map__cpu(kgem, &bo->base); |