Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Minor tweaks to make DBG compile again 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-07-01 22:43:02 +01:00
parent ad0afda3fe
commit 24a7bec7fa
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sna/sna_accel.c
View File

@ -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,
&region->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))) {

2
src/sna/sna_damage.c
View File

@ -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;

2
src/sna/sna_io.c
View File

@ -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