2 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c b/src/gallium/state_trackers/xorg/xorg_composite.c
index 778a8a183ea..dff51f220d1 100644
--- a/src/gallium/state_trackers/xorg/xorg_composite.c
+++ b/src/gallium/state_trackers/xorg/xorg_composite.c
@@ -656,7 +656,7 @@ boolean xorg_solid_bind_state(struct exa_context *exa,
    cso_set_vertex_shader_handle(exa->cso, shader.vs);
    cso_set_fragment_shader_handle(exa->cso, shader.fs);
 
-   return TRUE;
+   return FALSE;
 }
 
 void xorg_solid(struct exa_context *exa,
diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c
index 1eed3d86f7b..458ddb66bb8 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa.c
@@ -233,8 +233,10 @@ ExaDone(PixmapPtr pPixmap)
 	return;
 
     exa->ctx->flush(exa->ctx, PIPE_FLUSH_RENDER_CACHE, &fence);
+#if 0
     exa->ctx->screen->fence_finish(exa->ctx->screen, fence, 0);
     exa->ctx->screen->fence_reference(exa->ctx->screen, &fence, NULL);
+#endif
 
     if (priv->src_surf)
 	exa->scrn->tex_surface_destroy(priv->src_surf);