diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-03-11 17:14:07 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-03-11 18:16:34 +0000 |
| commit | b500e30d5dbcf91542c2831ebd3c48b28a01bf28 (patch) | |
| tree | 1c4666c487e18d49aabd1e97fed45c624c7b0226 | |
| parent | 17a99f0743836997aa8e4f7eafc0ea4978244f44 (diff) | |
sna: Mark the userptr as a CPU mapping
This helps clarify some recent asserts.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/kgem.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c index d469e512..20326798 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -1478,9 +1478,10 @@ static void kgem_bo_free(struct kgem *kgem, struct kgem_bo *bo) if (IS_USER_MAP(bo->map)) { assert(bo->rq == NULL); - assert(MAP(bo->map) != bo || bo->io); - if (bo != MAP(bo->map)) { + assert(MAP(bo->map) != bo || bo->io || bo->flush); + if (!(bo->io || bo->flush)) { DBG(("%s: freeing snooped base\n", __FUNCTION__)); + assert(bo != MAP(bo->map)); free(MAP(bo->map)); } bo->map = NULL; @@ -4077,7 +4078,6 @@ struct kgem_bo *kgem_create_cpu_2d(struct kgem *kgem, return NULL; } - bo->map = MAKE_USER_MAP(ptr); bo->pitch = stride; bo->unique_id = kgem_get_unique_id(kgem); return bo; @@ -4454,6 +4454,7 @@ void *kgem_bo_map__async(struct kgem *kgem, struct kgem_bo *bo) assert(!bo->purged); assert(bo->proxy == NULL); assert(list_is_empty(&bo->list)); + assert(!IS_USER_MAP(bo->map)); if (bo->tiling == I915_TILING_NONE && !bo->scanout && kgem->has_llc) { DBG(("%s: converting request for GTT map into CPU map\n", @@ -4496,6 +4497,7 @@ void *kgem_bo_map(struct kgem *kgem, struct kgem_bo *bo) assert(!bo->purged); assert(bo->proxy == NULL); assert(list_is_empty(&bo->list)); + assert(!IS_USER_MAP(bo->map)); assert(bo->exec == NULL); if (bo->tiling == I915_TILING_NONE && !bo->scanout && @@ -4561,6 +4563,7 @@ void *kgem_bo_map__gtt(struct kgem *kgem, struct kgem_bo *bo) assert(!bo->purged); assert(bo->exec == NULL); assert(list_is_empty(&bo->list)); + assert(!IS_USER_MAP(bo->map)); if (IS_CPU_MAP(bo->map)) kgem_bo_release_map(kgem, bo); @@ -4738,6 +4741,8 @@ struct kgem_bo *kgem_create_map(struct kgem *kgem, struct kgem_bo *bo; uint32_t handle; + assert(MAP(ptr) == ptr); + if (!kgem->has_userptr) return NULL; @@ -4752,6 +4757,7 @@ struct kgem_bo *kgem_create_map(struct kgem *kgem, } bo->snoop = !kgem->has_llc; + bo->map = MAKE_USER_MAP(ptr); debug_alloc__bo(kgem, bo); DBG(("%s(ptr=%p, size=%d, pages=%d, read_only=%d) => handle=%d\n", |