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

[Chris Wilson]

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

New commits:
commit 732cd11cf0ca813fdc06f9f09fab120ea4e3a7da
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jul 1 17:54:49 2014 +0100

    sna: Fix typo in LinearFramebuffer handling
    
    Eeek, when not using LinearFramebuffer we still want to create the GPU
    bo: s/,/;/
    
    Reported-by: Ilia Mirkin <imirkin at alum.mit.edu>
    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 02e5920..e317e65 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1615,7 +1615,9 @@ static bool sna_pixmap_alloc_gpu(struct sna *sna,
 		flags |= CREATE_SCANOUT;
 		tiling = -I915_TILING_X;
 	} else
-		tiling = sna_pixmap_default_tiling(sna, pixmap),
+		tiling = sna_pixmap_default_tiling(sna, pixmap);
+
+	DBG(("%s: pixmap=%ld\n", __FUNCTION__, pixmap->drawable.serialNumber));
 
 	priv->gpu_bo = kgem_create_2d(&sna->kgem,
 				      pixmap->drawable.width,
commit b5fa463b90c49ebc635d79b1561c94a4857e9cf6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jul 1 17:53:56 2014 +0100

    sna: Correct migration flags for initial scanout creation
    
    We want to preserve any contents preloaded (not that there should be
    any...)
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index ce319d2..abcc8ba 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -249,7 +249,7 @@ static Bool sna_create_screen_resources(ScreenPtr screen)
 		return FALSE;
 	}
 
-	if (!sna_pixmap_force_to_gpu(new_front, MOVE_WRITE)) {
+	if (!sna_pixmap_force_to_gpu(new_front, MOVE_READ)) {
 		xf86DrvMsg(screen->myNum, X_ERROR,
 			   "[intel] Failed to allocate video resources for front buffer %dx%d at depth %d\n",
 			   screen->width,