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

[Chris Wilson]

 src/sna/sna_display.c |    1 +
 src/sna/sna_driver.c  |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9c109f3dc56621215e580e74a6161f00035bdac3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Apr 12 21:15:54 2015 +0100

    sna: Mark the GPU as available before doing the mode restore on VT enter
    
    Sometimes we want to render with the GPU when doing a mode switch, e.g.
    if we need to initialise an output surface. To do so, we need to prepare
    the acceleration layer first.
    
    Lots of thanks to Vasily for tracking this one down.
    
    Reported-by: Vasily Khoruzhick <anarsoul at gmail.com>
    Bugzilla: https://bugs.archlinux.org/task/43534
    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 31500e7..488ca9b 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -1213,6 +1213,8 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL)
 	if (intel_get_master(sna->dev))
 		return FALSE;
 
+	sna_accel_enter(sna);
+
 	if (sna->flags & SNA_REPROBE) {
 		DBG(("%s: reporting deferred hotplug event\n", __FUNCTION__));
 		sna_mode_discover(sna);
@@ -1221,11 +1223,11 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL)
 	sna_mode_check(sna);
 
 	if (!sna_set_desired_mode(sna)) {
+		sna_accel_leave(sna);
 		intel_put_master(sna->dev);
 		return FALSE;
 	}
 
-	sna_accel_enter(sna);
 	return TRUE;
 }
 
commit 5d1ffd6f34d6280dbc792a8251c6442f480631e7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Apr 12 20:52:27 2015 +0100

    sna: Mark the fallback TearFree flip path as pending
    
    An oversight when enabling efficient sharing of the shadow_crtc (i.e.
    clients flipping to one monitor).
    
    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 03595da..9e6c8cc 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -7790,6 +7790,7 @@ void sna_mode_redisplay(struct sna *sna)
 						sna_crtc->flip_bo = bo;
 						sna_crtc->flip_bo->active_scanout++;
 						sna_crtc->flip_serial = sna_crtc->mode_serial;
+						sna_crtc->flip_pending = true;
 
 						sna_crtc->cache_bo = kgem_bo_reference(sna_crtc->bo);