From 70c5e41b519e44e620948d683d3b1111494d2f48 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 14 Jan 2013 15:03:59 +0000 Subject: sna: Limit temporary userptr uploads to large busy targets or LLC machines Signed-off-by: Chris Wilson --- src/sna/sna_accel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index c80f51dd..9c33bb4d 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -4363,8 +4363,9 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc, if (USE_USERPTR_UPLOADS && src_priv == NULL && sna->kgem.has_userptr && - ((bo->tiling && !bo->scanout) || __kgem_bo_is_busy(&sna->kgem, bo)) && - box_inplace(src_pixmap, ®ion->extents)) { + box_inplace(src_pixmap, ®ion->extents) && + ((sna->kgem.has_llc && bo->tiling && !bo->scanout) || + __kgem_bo_is_busy(&sna->kgem, bo))) { struct kgem_bo *src_bo; bool ok = false; -- cgit v1.2.3