xf86-video-intel: 2 commits - src/sna/sna_display.c src/sna/sna_dri.c

[Chris Wilson]

 src/sna/sna_display.c |    1 -
 src/sna/sna_dri.c     |    5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5fb165b02d47634ccf9fb72ab6fb4d65b89f78d0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Feb 11 22:15:17 2013 +0000

    sna/dri: Assert that the old scanout is clear before overwriting
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index 89e3410..732143a 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -1097,6 +1097,7 @@ sna_dri_page_flip(struct sna *sna, struct sna_dri_frame_event *info)
 	assert(sna_pixmap_get_buffer(sna->front) == info->front);
 	assert(get_drawable_pixmap(info->draw)->drawable.height * bo->pitch <= kgem_bo_size(bo));
 	assert(info->scanout[0].bo);
+	assert(info->scanout[1].bo == NULL);
 
 	info->count = sna_page_flip(sna, bo, info, info->pipe);
 	if (!info->count)
commit 2667b821e193c0badf16420f82f8a99a93c27a46
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Feb 11 22:06:00 2013 +0000

    sna/dri: Update flush status for tear-free exported GPU bo
    
    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 558d706..a294f7c 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3382,7 +3382,6 @@ disable:
 			sna_dri_pixmap_update_bo(sna, sna->front);
 
 			sna->mode.shadow = new;
-			new->flush = old->flush;
 		}
 
 		RegionEmpty(region);
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index ebdd66a..89e3410 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -219,10 +219,14 @@ sna_dri_pixmap_update_bo(struct sna *sna, PixmapPtr pixmap)
 	if (private->bo == bo)
 		return;
 
+	private->bo->flush = false;
 	kgem_bo_destroy(&sna->kgem, private->bo);
+
 	buffer->name = kgem_bo_flink(&sna->kgem, bo);
 	private->bo = ref(bo);
 
+	assert(bo->flush);
+
 	/* XXX DRI2InvalidateDrawable(&pixmap->drawable); */
 }