pixmap->devKind = priv->gpu_bo->pitch;
priv->mapped = MAPPED_GTT;
- assert(pixmap->devPrivate.ptr == MAP(priv->gpu_bo->map__gtt));
+ assert_pixmap_map(pixmap, priv);
fd = kgem_bo_export_to_prime(&sna->kgem, priv->gpu_bo);
if (fd == -1)
priv->stride = priv->gpu_bo->pitch;
priv->mapped = MAPPED_GTT;
- assert(pixmap->devPrivate.ptr == MAP(priv->gpu_bo->map__gtt));
+ assert_pixmap_map(pixmap, priv);
sna_damage_all(&priv->gpu_damage, width, height);
}
}
assert(!priv->move_to_gpu || (flags & MOVE_WRITE) == 0);
+
+ assert_pixmap_map(priv->pixmap, priv);
assert(priv->pixmap->devKind == priv->gpu_bo->pitch);
if (priv->pixmap->devPrivate.ptr == MAP(priv->gpu_bo->map__cpu)) {
pixmap->devPrivate.ptr = ptr;
pixmap->devKind = priv->gpu_bo->pitch;
priv->mapped = ptr == MAP(priv->gpu_bo->map__cpu) ? MAPPED_CPU : MAPPED_GTT;
-
- assert(has_coherent_map(sna, priv->gpu_bo, flags));
+ assert(has_coherent_ptr(sna, priv, flags));
assert(priv->gpu_bo->proxy == NULL);
sna_damage_all(&priv->gpu_damage,
ptr = kgem_bo_map(&sna->kgem, priv->gpu_bo);
if (ptr != NULL) {
- pixmap->devKind = priv->gpu_bo->pitch;
pixmap->devPrivate.ptr = ptr;
+ pixmap->devKind = priv->gpu_bo->pitch;
priv->mapped = ptr == MAP(priv->gpu_bo->map__cpu) ? MAPPED_CPU : MAPPED_GTT;
-
- assert(has_coherent_map(sna, priv->gpu_bo, flags));
+ assert(has_coherent_ptr(sna, priv, flags));
if (flags & MOVE_WRITE) {
assert(priv->gpu_bo->proxy == NULL);
pixmap->devPrivate.ptr = ptr;
pixmap->devKind = priv->gpu_bo->pitch;
priv->mapped = MAPPED_CPU;
+ assert(has_coherent_ptr(sna, priv, flags));
if (flags & MOVE_WRITE) {
assert(priv->gpu_bo->proxy == NULL);
pixmap->devPrivate.ptr = ptr;
pixmap->devKind = priv->gpu_bo->pitch;
priv->mapped = ptr == MAP(priv->gpu_bo->map__cpu) ? MAPPED_CPU : MAPPED_GTT;
+ assert(has_coherent_ptr(sna, priv, flags));
- assert(has_coherent_map(sna, priv->gpu_bo, flags));
if (flags & MOVE_WRITE) {
if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
assert(!priv->clear);
pixmap->devPrivate.ptr = ptr;
pixmap->devKind = priv->gpu_bo->pitch;
priv->mapped = MAPPED_CPU;
+ assert(has_coherent_ptr(sna, priv, flags));
- assert(has_coherent_map(sna, priv->gpu_bo, flags));
- assert(pixmap->devPrivate.ptr == MAP(priv->gpu_bo->map__cpu));
if (flags & MOVE_WRITE) {
if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
assert(!priv->clear);
pixmap->devPrivate.ptr = dst;
pixmap->devKind = priv->gpu_bo->pitch;
priv->mapped = MAPPED_CPU;
+ assert_pixmap_map(pixmap, priv);
priv->cpu = true;
}
}
src_pixmap->devPrivate.ptr = ptr;
src_pixmap->devKind = src_priv->gpu_bo->pitch;
src_priv->mapped = MAPPED_CPU;
+ assert_pixmap_map(src_pixmap, src_priv);
src_priv->cpu = true;
}
}
dst_pixmap->devPrivate.ptr = ptr;
dst_pixmap->devKind = dst_priv->gpu_bo->pitch;
dst_priv->mapped = MAPPED_CPU;
+ assert_pixmap_map(dst_pixmap, dst_priv);
dst_priv->cpu = true;
}
}
pixmap->devPrivate.ptr = src;
pixmap->devKind = priv->gpu_bo->pitch;
priv->mapped = MAPPED_CPU;
+ assert_pixmap_map(pixmap, priv);
priv->cpu = true;
}
}