[PATCH] glamor: Don't call glamor_copy_fbo_cpu() for GLAMOR_DRM_ONLY pixmaps

Michel Dänzer michel at daenzer.net
Wed Aug 13 01:10:21 PDT 2014


From: Michel Dänzer <michel.daenzer at amd.com>

It results in a crash.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---

Looks like I failed to test glamor_copy_fbo_cpu() with piglit before.

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

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);
-- 
2.1.0.rc1



More information about the xorg-devel mailing list