A fix for the bug reported in https://bugs.freedesktop.org/show_bug.cgi?id=5897
needs to be integrated into the 6.9.x branch.
Sorry about the phenomenal bug spam, guys. Adding xorg-team@ to the QA contact so bugs don't get lost in future.
Clearly, 6.9.x branch fixes are not going to happen at this point.