Upstream ended up committing yet a different patch, Please see last few comments https://bugs.freedesktop.org/show_bug.cgi?id=71759 Note that the patch is not yet added to the stable 12.0 branch.