Comment 93 for bug 1189850

This bug just reappeared with xf86-video-intel-2.21.10. Next thing I am going to try is this commit you've posted above.