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

[Chris Wilson]

 src/sna/sna_dri2.c   |    2 +-
 src/sna/sna_driver.c |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b8d52b0edd2ad6a2513d37001ee9d8f67c9acaa7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jan 26 21:40:20 2015 +0000

    sna: Log maximum number of CPU threads
    
    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 09f5f08..6e2f221 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -677,8 +677,10 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int probe)
 	}
 
 	intel_detect_chipset(scrn, sna->dev);
-	xf86DrvMsg(scrn->scrnIndex, X_PROBED, "CPU: %s\n",
-		   sna_cpu_features_to_string(sna->cpu_features, buf));
+	xf86DrvMsg(scrn->scrnIndex, X_PROBED,
+		   "CPU: %s; using a maximum of %d threads\n",
+		   sna_cpu_features_to_string(sna->cpu_features, buf),
+		   sna_use_threads(64*1024, 64*1024, 1));
 
 	if (!xf86SetDepthBpp(scrn, 24, 0, 0,
 			     Support32bppFb |
commit d2b7d78064ca224bdcc365bede1b16991d43caa8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jan 26 21:30:44 2015 +0000

    sna/dri2: Use existing busy state if semaphores are disabled
    
    Undo d16ac1f30bb (sna/dri2: Prefer to use normal selection criteria for
    CopyRegion on small GT) to keep on the current ring as the external bo
    if semaphores are disabled.
    
    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 8bbb598..fd3edcc 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -841,7 +841,7 @@ static void sna_dri2_select_mode(struct sna *sna, struct kgem_bo *dst, struct kg
 		return;
 	}
 
-	if (sna->render_state.gt < 2) {
+	if (sna->render_state.gt < 2 && sna->kgem.has_semaphores) {
 		DBG(("%s: small GT [%d], not forcing selection\n",
 		     __FUNCTION__, sna->render_state.gt));
 		return;