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

[Chris Wilson]

 src/sna/sna_accel.c   |    4 ++--
 src/sna/sna_display.c |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit e2e139923dd000f13602e51d94bc8a265b5e234f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri May 24 15:08:13 2013 +0100

    sna: Log when the framebuffer changes size
    
    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 ba9bf79..7818f34 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2568,6 +2568,10 @@ sna_mode_resize(ScrnInfoPtr scrn, int width, int height)
 	if (!new_front)
 		return FALSE;
 
+	xf86DrvMsg(crtc->scrn->scrnIndex, X_INFO,
+		   "resizing framebuffer to %dx%d\n",
+		   width, height);
+
 	for (i = 0; i < xf86_config->num_crtc; i++)
 		sna_crtc_disable_shadow(sna, to_sna_crtc(xf86_config->crtc[i]));
 	assert(sna->mode.shadow_active == 0);
commit 820f97ede7a38015a781de72cc265b0b65f86415
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri May 24 14:38:06 2013 +0100

    sna: Reorder cleanup of flush list and CPU bo to silence an assertion
    
    Keep the bookkeeping in order.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index d1fa6fd..b839194 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2915,6 +2915,8 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
 	}
 
 done:
+	if (priv->cpu_damage == NULL && priv->flush)
+		list_del(&priv->flush_list);
 	if (flags & MOVE_WRITE) {
 		priv->clear = false;
 		priv->cpu = false;
@@ -2932,8 +2934,6 @@ done:
 		if (DAMAGE_IS_ALL(priv->gpu_damage))
 			sna_pixmap_free_cpu(sna, priv);
 	}
-	if (priv->cpu_damage == NULL && priv->flush)
-		list_del(&priv->flush_list);
 
 	assert(!priv->gpu_bo->proxy || (flags & MOVE_WRITE) == 0);
 	return sna_pixmap_mark_active(sna, priv) != NULL;