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

sna: Add some more paranoia that we correctly map before fallbacks 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-01-28 23:14:57 +00:00
parent 63c71bcd96
commit 1dc2d9ede5
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sna/sna_accel.c
View File

@ -1653,6 +1653,7 @@ skip_inplace_map:
!sna_pixmap_alloc_cpu(sna, pixmap, priv,
flags & MOVE_READ ? priv->gpu_damage && !priv->clear : 0))
return false;
assert(pixmap->devPrivate.ptr);
if (priv->clear) {
DBG(("%s: applying clear [%08x]\n",
@ -1994,6 +1995,7 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
RegionTranslate(region, -dx, -dy);
return false;
}
assert(pixmap->devPrivate.ptr);
if (priv->gpu_bo == NULL) {
assert(priv->gpu_damage == NULL);
@ -4524,6 +4526,7 @@ fallback:
return;
}
assert(dst_pixmap->devPrivate.ptr);
do {
pixman_fill(dst_pixmap->devPrivate.ptr,
dst_pixmap->devKind/sizeof(uint32_t),

2
src/sna/sna_composite.c
View File

@ -996,6 +996,8 @@ fallback:
!sna_drawable_move_to_cpu(dst->alphaMap->pDrawable, error))
goto done;
assert(pixmap->devPrivate.ptr);
if (op <= PictOpSrc) {
int nbox = REGION_NUM_RECTS(&region);
BoxPtr box = REGION_RECTS(&region);