Can you try if http://cgit.freedesktop.org/xorg/xserver/commit/?id=25eca80265654cfbf8768024e027426fedeb0918 helps?