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

[Chris Wilson]

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

New commits:
commit b2081345843152dadcaa4fbc843b38240d1a3484
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 18 07:37:00 2014 +0100

    sna/dri2: fix invalid DBG string
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=80157
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index c35e0bd..e689a34 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -1029,7 +1029,7 @@ fallback:
 			kgem_submit(&sna->kgem);
 			if (rq->bo) {
 				bo = ref(rq->bo);
-				DBG(("%s: recording sync fence handle=%d\n", bo->handle));
+				DBG(("%s: recording sync fence handle=%d\n", __FUNCTION__, bo->handle));
 			}
 		}
 	}
commit 77f1a16f1145e69d69a76f2db4b1c60d9a7a4d53
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jun 17 23:27:16 2014 +0100

    sna: Set the correct mapping type after calling mmap__async
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=80001
    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 61f167a..52619b6 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1151,7 +1151,7 @@ sna_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, void **fd_handle)
 	assert((priv->gpu_bo->pitch & 255) == 0);
 
 	/* And export the bo->pitch via pixmap->devKind */
-	if (priv->mapped != MAPPED_GTT) {
+	if (!priv->mapped) {
 		void *ptr;
 
 		ptr = kgem_bo_map__async(&sna->kgem, priv->gpu_bo);
@@ -1160,7 +1160,7 @@ sna_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, void **fd_handle)
 
 		pixmap->devPrivate.ptr = ptr;
 		pixmap->devKind = priv->gpu_bo->pitch;
-		priv->mapped = MAPPED_GTT;
+		priv->mapped = ptr == MAP(priv->gpu_bo->map__cpu) ? MAPPED_CPU : MAPPED_GTT;
 	}
 	assert_pixmap_map(pixmap, priv);
 
@@ -1264,7 +1264,7 @@ sna_create_pixmap_shared(struct sna *sna, ScreenPtr screen,
 		pixmap->devKind = priv->gpu_bo->pitch;
 
 		priv->stride = priv->gpu_bo->pitch;
-		priv->mapped = MAPPED_GTT;
+		priv->mapped = pixmap->devPrivate.ptr == MAP(priv->gpu_bo->map__cpu) ? MAPPED_CPU : MAPPED_GTT;
 		assert_pixmap_map(pixmap, priv);
 
 		sna_damage_all(&priv->gpu_damage, pixmap);