Hmm. I don't see your first hunk been integrated in xorg-server git. Has this been discussed upstream?