xf86-video-intel: src/sna/sna_accel.c

[Chris Wilson]

 src/sna/sna_accel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac405326807e699cbe1263887d1cfb2882a0cf3d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 6 14:26:00 2015 +0000

    sna: Allow scanouts to be directly accessed via the GTT even when wedged
    
    We only want to prefer shadow access to ordinary pixmaps (to avoid
    reading back via the GTT). However, since we must use the GTT for
    scanouts, we may as well take advantage of direct writes even if the GPU
    is wedged.
    
    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 ab56ebd..e1a808f 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1311,7 +1311,7 @@ static PixmapPtr sna_create_pixmap(ScreenPtr screen,
 
 	if (unlikely((sna->render.prefer_gpu & PREFER_GPU_RENDER) == 0))
 		flags &= ~KGEM_CAN_CREATE_GPU;
-	if (wedged(sna))
+	if (wedged(sna) && usage != SNA_CREATE_FB)
 		flags &= ~KGEM_CAN_CREATE_GTT;
 
 	DBG(("%s: usage=%d, flags=%x\n", __FUNCTION__, usage, flags));