diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-10-11 12:16:03 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-10-11 12:16:03 +0100 |
| commit | 0b92a5a3062d73666279e17ac2d711314bcd8dfe (patch) | |
| tree | f584ac18a09684fb5f40c249d5b47f52517769ba | |
| parent | c51aaa731e5cffc892e59730194ad7c98789b02b (diff) | |
sna: Correct a bogus assertion after inplace PutImage
If we are forced to use the GPU bo as the target because the CPU bo is
busy, the priv->cpu flag is likely to remain set, so we need to clear it
rather than fail the assertion that is false.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_accel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 4d6c7988..a8a0c931 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -3553,7 +3553,6 @@ sna_put_zpixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region, if (upload_inplace(sna, pixmap, priv, region) && sna_put_image_upload_blt(drawable, gc, region, x, y, w, h, bits, stride)) { - assert(priv->cpu == false); if (!DAMAGE_IS_ALL(priv->gpu_damage)) { DBG(("%s: marking damage\n", __FUNCTION__)); if (region_subsumes_drawable(region, &pixmap->drawable)) @@ -3582,6 +3581,7 @@ sna_put_zpixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region, assert_pixmap_damage(pixmap); priv->clear = false; + priv->cpu = false; return true; } |