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

sna/dri: Handle failure to move the pixmap into the GPU for CopyRegion 

It should not fail, except in extreme cicumstances, and even then we shall
not crash.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-09-03 17:37:33 +01:00
parent 5c51cd4e91
commit 47e718bf32
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sna/sna_dri.c
View File

@ -760,7 +760,7 @@ __sna_dri_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
struct sna_pixmap *priv;
unsigned int flags;
flags = MOVE_WRITE;
flags = MOVE_WRITE | __MOVE_FORCE;
if (clip.data ||
clip.extents.x1 > 0 ||
clip.extents.x2 < pixmap->drawable.width ||
@ -769,10 +769,10 @@ __sna_dri_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
flags |= MOVE_READ;
priv = sna_pixmap_move_to_gpu(pixmap, flags);
if (priv)
if (priv) {
damage(pixmap, priv, region);
dst_bo = priv->gpu_bo;
damage(pixmap, priv, region);
}
} else
sync = false;