diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-01 22:43:02 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-01 22:51:22 +0100 |
| commit | 24a7bec7faa7dcc4393ef7f66939ae0fb8acdf36 (patch) | |
| tree | 0cc1dc7e0acd43f49176110764f128e5d125e45b /src | |
| parent | ad0afda3fe4f5e408e3610d8b76fdc7d1af33138 (diff) | |
sna: Minor tweaks to make DBG compile again
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/sna_accel.c | 2 | ||||
| -rw-r--r-- | src/sna/sna_damage.c | 2 | ||||
| -rw-r--r-- | src/sna/sna_io.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 9d8bd4cd..010f6e43 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -2352,10 +2352,10 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable, if (USE_INPLACE && priv->gpu_damage && + priv->gpu_bo->tiling == I915_TILING_NONE && (DAMAGE_IS_ALL(priv->gpu_damage) || sna_damage_contains_box__no_reduce(priv->gpu_damage, ®ion->extents)) && - priv->gpu_bo->tiling == I915_TILING_NONE && kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, flags & MOVE_WRITE) && ((flags & (MOVE_WRITE | MOVE_ASYNC_HINT)) == 0 || !__kgem_bo_is_busy(&sna->kgem, priv->gpu_bo))) { diff --git a/src/sna/sna_damage.c b/src/sna/sna_damage.c index 30cc83b3..cd478f4b 100644 --- a/src/sna/sna_damage.c +++ b/src/sna/sna_damage.c @@ -116,7 +116,7 @@ static const char *_debug_describe_region(char *buf, int max, } static const char *_debug_describe_damage(char *buf, int max, - struct sna_damage *damage) + const struct sna_damage *damage) { char damage_str[500], region_str[500]; int str_max; diff --git a/src/sna/sna_io.c b/src/sna/sna_io.c index 78614622..0a38aa82 100644 --- a/src/sna/sna_io.c +++ b/src/sna/sna_io.c @@ -223,7 +223,7 @@ void sna_read_boxes(struct sna *sna, PixmapPtr dst, struct kgem_bo *src_bo, bool can_blt; DBG(("%s x %d, src=(handle=%d), dst=(size=(%d, %d)\n", - __FUNCTION__, nbox, src_bo->handle, src_dy, + __FUNCTION__, nbox, src_bo->handle, dst->drawable.width, dst->drawable.height)); #ifndef NDEBUG |