I can't really verify the X bits of this patch.  However, I do understand the problem and I can verify that using quad-buffering is a totally sane solution.  We had this issue about a year ago with Wayland apps trying to do eglSwapInterval(0) and mesa quad-buffers in that case too.