xf86-video-intel: src/sna/sna_display.c

Chris Wilson ickle at kemper.freedesktop.org
Sat Jul 20 12:56:19 PDT 2013


 src/sna/sna_display.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit e9823ec2a9f81b2e1c78eb91b695847535b0d0af
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jul 20 20:54:58 2013 +0100

    sna: Release cloned pixmap when updating tearfree scanout
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 6f037ac..e036e94 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3817,6 +3817,10 @@ static void set_bo(PixmapPtr pixmap, struct kgem_bo *bo)
 	struct sna_pixmap *priv = sna_pixmap(pixmap);
 
 	assert((priv->pinned & PIN_PRIME) == 0);
+	assert(bo != priv->gpu_bo);
+
+	if (priv->cow)
+		sna_pixmap_undo_cow(to_sna_from_pixmap(pixmap), priv, 0);
 
 	if (priv->mapped) {
 		assert(!priv->shm && priv->stride);


More information about the xorg-commit mailing list