From 0d7306ffe2e069f0091c4f174f138127100abb43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
Date: Wed, 13 Aug 2014 17:10:21 +0900
Subject: [PATCH] glamor: Don't call glamor_copy_fbo_cpu() for GLAMOR_DRM_ONLY
 pixmaps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It results in a crash.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 glamor/glamor_copy.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/glamor/glamor_copy.c b/glamor/glamor_copy.c
index b84fcf250..6f422d419 100644
--- a/glamor/glamor_copy.c
+++ b/glamor/glamor_copy.c
@@ -635,6 +635,7 @@ glamor_copy_gl(DrawablePtr src,
             return glamor_copy_cpu_fbo(src, dst, gc, box, nbox, dx, dy,
                                        reverse, upsidedown, bitplane, closure);
     } else if (GLAMOR_PIXMAP_PRIV_HAS_FBO(src_priv) &&
+               dst_priv->type != GLAMOR_DRM_ONLY &&
                bitplane == 0) {
             return glamor_copy_fbo_cpu(src, dst, gc, box, nbox, dx, dy,
                                        reverse, upsidedown, bitplane, closure);