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

[Chris Wilson]

 src/sna/sna_dri.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 4bad76b4510d8cf4ccf3f64bcd13ebb80fae4d26
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Aug 4 14:28:41 2012 +0100

    sna/dri: Don't force ring selection if we have semaphores
    
    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 89ecb65..435d22e 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -461,6 +461,12 @@ static void sna_dri_select_mode(struct sna *sna, struct kgem_bo *src, bool sync)
 		return;
 	}
 
+	if (sna->kgem.has_semaphores) {
+		DBG(("%s: have sempahores, prefering RENDER\n", __FUNCTION__));
+		kgem_set_mode(&sna->kgem, KGEM_RENDER);
+		return;
+	}
+
 	VG_CLEAR(busy);
 	busy.handle = src->handle;
 	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_I915_GEM_BUSY, &busy))
commit fb7b584ec9d0ea96175ba3a621699378c6724940
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Aug 4 14:27:46 2012 +0100

    sna/dri: Correct ring selection for a busy bo
    
    Confused the RENDER ring with the BLT, limiting swap performance.
    
    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 8d6c305..89ecb65 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -488,7 +488,7 @@ static void sna_dri_select_mode(struct sna *sna, struct kgem_bo *src, bool sync)
 	 * the cost of the query.
 	 */
 	mode = KGEM_RENDER;
-	if (busy.busy & (1 << 16))
+	if (busy.busy & (1 << 17))
 		mode = KGEM_BLT;
 	_kgem_set_mode(&sna->kgem, mode);
 }