Patched Mesa is now up in the build repo, please report if that fixes your issues (I don't see it, so can't check).
I had hoped the patch would be merged before applying, but the MR keeps showing as blocked
, no indication why, looks like it won't be part of Mesa 21.3.5. So this patched version won't move until it is shown it is an improvement.