sna: Force the damage on the DRI pixmap to be flushed to the GPU

Otherwise nothing will happen if we consider ourselves wedged.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-07-26 14:58:04 +01:00
parent f50d7b03b5
commit 8c0e3bbb0c
1 changed files with 7 additions and 3 deletions

View File

@ -2659,8 +2659,11 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
BoxPtr box;
int n;
DBG(("%s(pixmap=%ld, usage=%d)\n",
__FUNCTION__, pixmap->drawable.serialNumber, pixmap->usage_hint));
DBG(("%s(pixmap=%ld, usage=%d), flags=%x\n",
__FUNCTION__,
pixmap->drawable.serialNumber,
pixmap->usage_hint,
flags));
if ((flags & __MOVE_FORCE) == 0 && wedged(sna))
return NULL;
@ -13278,7 +13281,8 @@ sna_accel_flush_callback(CallbackListPtr *list,
} else {
DBG(("%s: flushing DRI pixmap=%ld\n", __FUNCTION__,
priv->pixmap->drawable.serialNumber));
ret = sna_pixmap_move_to_gpu(priv->pixmap, MOVE_READ);
ret = sna_pixmap_move_to_gpu(priv->pixmap,
MOVE_READ | __MOVE_FORCE);
}
(void)ret;
}