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

[Chris Wilson]

 src/sna/kgem.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 9a0a1329391cc7d3047fea4b3d968afc7c6099b4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jan 10 21:08:28 2014 +0000

    sna: Handle release of active stolen scanouts
    
    If the scanout is still active we want to defer our release until the
    request is retired.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 187e4ff..5d34bbc 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1867,10 +1867,12 @@ static void kgem_bo_move_to_scanout(struct kgem *kgem, struct kgem_bo *bo)
 	assert(!bo->snoop);
 	assert(!bo->io);
 
-	if (bo->purged) {
-		DBG(("%s: discarding purged scanout - external name?\n",
-		     __FUNCTION__));
-		kgem_bo_free(kgem, bo);
+	if (bo->purged) { /* for stolen fb */
+		if (!bo->exec) {
+			DBG(("%s: discarding purged scanout - stolen?\n",
+			     __FUNCTION__));
+			kgem_bo_free(kgem, bo);
+		}
 		return;
 	}