xserver: Branch 'master'

[Keith Packard]

 glamor/glamor_copy.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0d7306ffe2e069f0091c4f174f138127100abb43
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Aug 13 17:10:21 2014 +0900

    glamor: Don't call glamor_copy_fbo_cpu() for GLAMOR_DRM_ONLY pixmaps
    
    It results in a crash.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glamor/glamor_copy.c b/glamor/glamor_copy.c
index b84fcf2..6f422d4 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);