I have a RFC with a potential fix on the mailing list: https://lists.freedesktop.org/archives/mesa-dev/2018-March/187675.html