Give this a try: http://cgit.freedesktop.org/~darktama/nouveau/commit/?id=31080d6499d64e0578ef55f7473ed83b7bfd72af