Just one further note, that the previously sent patch seems to work just as well against 6.5.2-5 (the version of Mesa in unstable)...