Alright, that fixed the CS rejections as expected. However the Mesa patch doesn't fix the flickering.