In case you haven't followed https://bugs.freedesktop.org/show_bug.cgi?id=54615 I got a patch there which seems to fix this problem. Stefan