From 0040eb84c9187476a75202ebb251dd74354e4fc7 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 5 Dec 2012 09:25:17 +0000 Subject: [PATCH] sna: Don't disable CPU bo if supported on unknown hw Signed-off-by: Chris Wilson --- src/sna/sna_accel.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index b7030cd7..51ea1a87 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -1158,27 +1158,29 @@ static PixmapPtr sna_create_pixmap(ScreenPtr screen, goto fallback; } - if (!can_render(sna)) + if (unlikely(!sna->have_render)) + flags &= ~KGEM_CAN_CREATE_GPU; + if (wedged(sna)) flags = 0; - if (usage == CREATE_PIXMAP_USAGE_SCRATCH) { + switch (usage) { + case CREATE_PIXMAP_USAGE_SCRATCH: if (flags & KGEM_CAN_CREATE_GPU) return sna_pixmap_create_scratch(screen, width, height, depth, I915_TILING_X); else goto fallback; - } - if (usage == SNA_CREATE_GLYPHS) { + case SNA_CREATE_GLYPHS: if (flags & KGEM_CAN_CREATE_GPU) return sna_pixmap_create_scratch(screen, width, height, depth, -I915_TILING_Y); else goto fallback; - } - if (usage == SNA_CREATE_SCRATCH) { + + case SNA_CREATE_SCRATCH: if (flags & KGEM_CAN_CREATE_GPU) return sna_pixmap_create_scratch(screen, width, height, depth,