xf86-video-intel: src/sna/sna_accel.c
Chris Wilson
ickle at kemper.freedesktop.org
Fri Mar 1 07:51:00 PST 2013
src/sna/sna_accel.c | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 8c2dedaa4df2522d6a1725c09e9700c5d753ac93
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Mar 1 15:49:57 2013 +0000
sna: Assert that inplace operations are done on coherent maps
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 8fefd05..730beaf 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1558,6 +1558,7 @@ _sna_pixmap_move_to_cpu(PixmapPtr pixmap, unsigned int flags)
if (!priv->mapped)
goto skip_inplace_map;
+ assert(!IS_CPU_MAP(priv->gpu_bo->map) || sna->kgem.has_llc);
pixmap->devKind = priv->gpu_bo->pitch;
assert(priv->gpu_bo->proxy == NULL);
@@ -1614,6 +1615,7 @@ skip_inplace_map:
pixmap->devPrivate.ptr = kgem_bo_map(&sna->kgem, priv->gpu_bo);
priv->mapped = pixmap->devPrivate.ptr != NULL;
if (priv->mapped) {
+ assert(!IS_CPU_MAP(priv->gpu_bo->map) || sna->kgem.has_llc);
pixmap->devKind = priv->gpu_bo->pitch;
if (flags & MOVE_WRITE) {
assert(priv->gpu_bo->proxy == NULL);
@@ -1971,6 +1973,7 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
pixmap->devPrivate.ptr = kgem_bo_map(&sna->kgem, priv->gpu_bo);
priv->mapped = pixmap->devPrivate.ptr != NULL;
if (priv->mapped) {
+ assert(!IS_CPU_MAP(priv->gpu_bo->map) || sna->kgem.has_llc);
pixmap->devKind = priv->gpu_bo->pitch;
if (flags & MOVE_WRITE) {
if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
More information about the xorg-commit
mailing list